P4 to Git Change 1156178 by kzhuravl@win-kzhuravl-stg-oclhsa on 2015/05/30 02:59:02

EPR #333756 - Integrate header file cleanup from stg hsa and do necessary updates (cross branch checkin)

	Reviewers: Nikolay, Evgeniy, Laurent
	Testing: p4precheckin(http://ocltc:8111/viewModification.html?modId=52194&personal=true&init=1&tab=vcsModificationBuilds)

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/amd_hsa_common.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/amd_hsa_elf.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/amd_hsa_kernel_code.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/amd_hsa_queue.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/amd_hsa_signal.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/hsa.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/hsa_ext_finalize.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/HSAIL/include/hsa_ext_image.h#1 branch
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/SI/scCompileSI.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/build/Makefile.scwrapper#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/build/Makefile.gpu#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugger.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#110 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#363 edit


[ROCm/clr commit: 097a9fdd56]

projects/clr/rocclr/runtime/device/gpu/gpudebugger.hpp

@@ -15,7 +15,7 @@
 #include <cstddef>
 #include <cstdint>
 #include "hsa.h"
-#include "sc/Interface/SCHSAInterface.h"
+#include "amd_hsa_kernel_code.h"
 #include "device/device.hpp"
 #include "device/hwdebug.hpp"
 #include "acl.h"

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

@@ -13,7 +13,7 @@
 #include "platform/sampler.hpp"
 #include "device/gpu/gpudevice.hpp"
 #include "device/gpu/gpuvirtual.hpp"
-#include "sc/Interface/SCHSAInterface.h"
+#include "amd_hsa_kernel_code.h"
 #include "device/gpu/gpuprintf.hpp"
 #include "device/gpu/gpuwavelimiter.hpp"
 #include "hsa.h"

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

@@ -16,7 +16,8 @@
 #include "device/gpu/gpublit.hpp"
 #include "device/gpu/gpudebugger.hpp"
 #include "hsa.h"
-#include "sc/Interface/SCHSAInterface.h"
+#include "amd_hsa_kernel_code.h"
+#include "amd_hsa_queue.h"
 #include <fstream>
 #include <sstream>