git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copy shadow argument conditionally (PR hsa/70337) 

PR hsa/70337
	* plugin/plugin-hsa.c (GOMP_OFFLOAD_run): Copy shadow
	argument just in case a dispatched kernel uses that argument.

From-SVN: r234418
This commit is contained in:
Martin Liska 2016-03-23 10:59:51 +01:00 committed by Martin Liska
parent 0179520a83
commit 7397fce2f7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgomp/ChangeLog
View File

@ -1,3 +1,9 @@
2016-03-23 Martin Liska <mliska@suse.cz>
PR hsa/70337
* plugin/plugin-hsa.c (GOMP_OFFLOAD_run): Copy shadow
argument just in case a dispatched kernel uses that argument.
2016-03-16 Thomas Schwinge <thomas@codesourcery.com> 2016-03-16 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Adjust to * testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Adjust to

10
libgomp/plugin/plugin-hsa.c
View File

@ -1255,8 +1255,16 @@ GOMP_OFFLOAD_run (int n, void *fn_ptr, void *vars, void **args)
hsa_signal_store_relaxed (s, 1); hsa_signal_store_relaxed (s, 1);
memcpy (shadow->kernarg_address, &vars, sizeof (vars)); memcpy (shadow->kernarg_address, &vars, sizeof (vars));
memcpy (shadow->kernarg_address + sizeof (vars), &shadow, /* PR hsa/70337. */
size_t vars_size = sizeof (vars);
if (kernel->kernarg_segment_size > vars_size)
{
if (kernel->kernarg_segment_size != vars_size
+ sizeof (struct hsa_kernel_runtime *))
GOMP_PLUGIN_fatal ("Kernel segment size has an unexpected value");
memcpy (packet->kernarg_address + vars_size, &shadow,
sizeof (struct hsa_kernel_runtime *)); sizeof (struct hsa_kernel_runtime *));
}
HSA_DEBUG ("Copying kernel runtime pointer to kernarg_address\n"); HSA_DEBUG ("Copying kernel runtime pointer to kernarg_address\n");