Merge 'master' into 'amd-master'

Change-Id: I2d2b621a937a8a645072fe76c371ccb36f059a6e

samples/0_Intro/module_api/Makefile

@@ -5,7 +5,7 @@ endif
 HIPCC=$(HIP_PATH)/bin/hipcc
 HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --compiler)
 
-all: vcpy_kernel.code runKernel.hip.out defaultDriver.hip.out
+all: vcpy_kernel.code runKernel.hip.out launchKernelHcc.hip.out
 
 runKernel.hip.out: runKernel.cpp
 	$(HIPCC) $(HIPCC_FLAGS) $< -o $@
@@ -13,8 +13,8 @@ runKernel.hip.out: runKernel.cpp
 launchKernelHcc.hip.out: launchKernelHcc.cpp
 	$(HIPCC) $(HIPCC_FLAGS) $< -o $@
 
-defaultDriver.hip.out: defaultDriver.cpp
-	$(HIPCC)  $(HIPCC_FLAGS) $< -o $@
+#defaultDriver.hip.out: defaultDriver.cpp
+#	$(HIPCC)  $(HIPCC_FLAGS) $< -o $@
 
 vcpy_kernel.code: vcpy_kernel.cpp
 	$(HIPCC)  --genco  $(GENCO_FLAGS) $^ -o $@

samples/0_Intro/module_api/launchKernelHcc.cpp

@@ -72,6 +72,7 @@ int main(){
 		uint32_t one = 1;
 
     struct {
+        uint32_t _hidden[6];
         void * _Ad;
         void * _Bd;
     } args;

samples/0_Intro/module_api/runKernel.cpp

@@ -68,6 +68,7 @@ int main(){
 		uint32_t one = 1;
 
     struct {
+        uint32_t _hidden[6];
         void * _Ad;
         void * _Bd;
     } args;

samples/0_Intro/module_api/test.cl

@@ -1,12 +0,0 @@
-__kernel void memset(char in, __global int* out) {
-int tx = get_global_id(0);
-out[tx] = in;
-}
-
-
-__kernel void vadd(__global float *Ad, __global float *Bd, __global float *Cd, int N){
-int tx = get_global_id(0);
-if(tx < N){
-Cd[tx] = Ad[tx] + Bd[tx];
-}
-}