P4 to Git Change 1182078 by yaxunl@yaxunl_stg_win50 on 2015/08/19 07:12:32

ECR #354633 - SPIR-V: Add consumption of SPIR-V to HSAIL path.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#120 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/OpenCL.def.in#11 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_exports.map.in#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/Makefile#35 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#34 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/aclValidation.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#73 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#90 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/acl.h#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclEnums.h#21 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclTypes.h#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/bifinternal.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/Makefile#1 add
... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/build/Makefile#1 add
... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/build/Makefile.spirv#1 add
... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/spirvUtils.cpp#1 add
... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/spirvUtils.h#1 add
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.hpp#16 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#182 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#250 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#200 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#64 edit
... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/select.zip#1 add
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#46 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.h#4 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/aclAPI.cpp#20 edit

rocclr/compiler/lib/utils/options.hpp

@@ -165,6 +165,8 @@ enum DumpFlags {
     DUMP_BC_OPTIMIZED  = 0x00000400,   // bitcode after optimization (llvm opt's output)
     DUMP_CGIL          = 0x00000800,   // output il generated by Codegen (llvm llc's output)
     DUMP_DEBUGIL       = 0x00001000,   // debug il (from MDParser, dwarf refers to)
+    DUMP_SPIRV         = 0x00002000,   // SPIR-V binary
+    DUMP_BC_SPIRV      = 0x00004000,   // bitcode translated from SPIR-V
 
     // For a binary is encrypted, can only dump the following
     DUMP_ENCRYPT       = (DUMP_DLL | DUMP_BIF),
@@ -174,7 +176,7 @@ enum DumpFlags {
                           DUMP_IL |DUMP_CGIL | DUMP_DEBUGIL |
                           DUMP_ISA | DUMP_BIF),
 
-    DUMP_ALL           = 0x00001FFF    // Everything
+    DUMP_ALL           = 0x00007FFF    // Everything
 };
 
 enum OptLevelFlags {

rocclr/compiler/lib/utils/v0_8/libUtils.h

@@ -376,4 +376,19 @@ inline bool writeFile(std::string source_filename, const char *source, size_t si
   return EXIT_SUCCESS;
 }
 
+#if !defined(BCMAG)
+#define BCMAG  "BC"
+#define SBCMAG 2
+#endif
+// Helper predicate returns true if p starts with bit code signature.
+// TODO: Move it into Compiler Lib back in new 1_0 API
+inline static bool
+isBcMagic(const char* p)
+{
+    if (p==NULL || strncmp(p, BCMAG, SBCMAG) != 0) {
+        return false;
+    }
+    return true;
+}
+
 #endif // _CL_LIB_UTILS_0_8_H_