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/include/v0_8/acl.h

@@ -229,7 +229,12 @@ const void* ACL_API_ENTRY
     const char *kernel,
     size_t *size,
     acl_error *error_code) ACL_API_0_8;
-
+//!--------------------------------------------------------------------------!//
+// Functions that deal with binary image.
+//!--------------------------------------------------------------------------!//
+bool ACL_API_ENTRY
+  aclValidateBinaryImage(const void* binary,
+    size_t length, unsigned) ACL_API_0_8;
 //!--------------------------------------------------------------------------!//
 // Functions that deal with aclJITObjectImage objects.
 //!--------------------------------------------------------------------------!//

rocclr/compiler/lib/include/v0_8/aclEnums.h

@@ -32,7 +32,8 @@ typedef enum _acl_error_enum_0_8 {
   ACL_INVALID_SPIR    = 24,
   ACL_LWVERIFY_FAIL   = 25,
   ACL_HWVERIFY_FAIL   = 26,
-  ACL_LAST_ERROR      = 27
+  ACL_SPIRV_LOAD_FAIL = 27,
+  ACL_LAST_ERROR      = 28
 } acl_error_0_8;
 
 typedef enum _comp_device_caps_enum_0_8 {
@@ -111,7 +112,8 @@ typedef enum _acl_type_enum_0_8 {
   ACL_TYPE_ISA            = 14,
   ACL_TYPE_HEADER         = 15,
   ACL_TYPE_RSLLVMIR_BINARY  = 16,
-  ACL_TYPE_LAST           = 17
+  ACL_TYPE_SPIRV_BINARY   = 17,
+  ACL_TYPE_LAST           = 18
 } aclType_0_8;
 
 //! Enum of the various loader types that are supported.
@@ -184,7 +186,8 @@ typedef enum _bif_sections_enum_0_8 {
   aclBRIGxxx3       = 33,
   aclHSADEBUG       = 34,
   aclKSTATS         = 35, // For storing kernel statistics
-  aclLAST           = 36
+  aclSPIRV          = 36,
+  aclLAST           = 37
 } aclSections_0_8;
 
 //! An enumeration that defines what are valid queries for aclQueryInfo.
@@ -212,7 +215,8 @@ typedef enum _rt_query_types_enum_0_8 {
   RT_CONTAINS_LOADER_MAP    = 20,
   RT_CONTAINS_SPIR          = 21,
   RT_NUM_KERNEL_HIDDEN_ARGS = 22,
-  RT_LAST_TYPE              = 23
+  RT_CONTAINS_SPIRV         = 23,
+  RT_LAST_TYPE              = 24
 } aclQueryType_0_8;
 
 //! An enumeration for the various GPU capabilities
@@ -328,4 +332,11 @@ typedef enum _acl_access_type_enum_0_8 {
   ACCESS_TYPE_LAST  = 4
 } aclAccessType_0_8;
 
+// Enumeration that specifies the binary types.
+typedef enum _acl_binary_image_type_enum_0_8 {
+  BINARY_TYPE_ELF   = 1,
+  BINARY_TYPE_LLVM  = 2,
+  BINARY_TYPE_SPIRV = 4,
+} aclBinaryImageType_0_8;
+
 #endif // _ACL_ENUMS_0_8_H_

rocclr/compiler/lib/include/v0_8/aclTypes.h

@@ -51,6 +51,7 @@ typedef enum   _bif_version_enum_0_8       aclBIFVersion;
 typedef enum   _bif_platform_enum_0_8      aclPlatform;
 typedef enum   _bif_sections_enum_0_8      aclSections;
 typedef enum   _acl_loader_type_enum_0_8   aclLoaderType;
+typedef enum   _acl_binary_image_type_enum_0_8   aclBinaryImageType;
 
 #include "aclFunctors.h"
 // Typedefs for function pointers