P4 to Git Change 1167979 by kzhuravl@linu-kzhuravl-oclhsa on 2015/07/06 16:55:44

EPR #333756 - AMD HSA Header Files Changes (cross branch checkin)

	- Switched AMD HSA Header Files from bitfields to bitmasks (amd_kernel_code_t and amd_queue_t)
	- Fixed minor typos/name inconsistencies
	- Made required changes in SC/Dev/SCDevUtil + device enqueue and runtime changes

	Testing: sc farm, precheckin (http://ocltc.amd.com:8111/viewModification.html?modId=54240&personal=true&tab=vcsModificationBuilds)
	ReviewBoardURL: http://ocltc.amd.com/reviews/r/7861/, http://ocltc.amd.com/reviews/r/7919/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/SI/scCompileSI.cpp#56 edit
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.cpp#2 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_common.h#5 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_kernel_code.h#5 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_queue.h#3 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_signal.h#3 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/Src/Dev/Dev2010.vcxproj.filters#7 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/Src/Dev/Tools/R1000Memory.cxx#6 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/Src/NSrc/SCShaderInfo.cpp#6 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/Src/NSrc/SCShaderInfo.hpp#6 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/Src/NSrc/SiHwShaders.cpp#6 integrate
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/devenq/devenq.h#10 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/devenq/schedule.cl#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#286 edit


[ROCm/clr commit: 8ba12a7808]

projects/clr/rocclr/runtime/device/gpu/gpukernel.cpp

@@ -4133,7 +4133,8 @@ HSAILKernel::loadArguments(
     if (NULL != prog().globalStore()) {
         memList.push_back(prog().globalStore());
     }
-    if (cpuAqlCode_->enable_sgpr_queue_ptr) {
+    if (AMD_HSA_BITS_GET(cpuAqlCode_->kernel_code_properties,
+          AMD_KERNEL_CODE_PROPERTIES_ENABLE_SGPR_QUEUE_PTR)) {
         memList.push_back(gpu.hsaQueueMem());
     }