P4 to Git Change 1141872 by yaxunl@yaxunl_stg_win50 on 2015/04/17 10:17:05

ECR #354633 - SPIR: Making SPIR loading work for HSAIL path.
	Fixed arch type when creating elf for SPIR.
	Fixed query of elf for contained IR.
	Fixed copying elf binary containing SPIR for HSAIL path.
	Added translation of kernel name in SPIR loader for HSAIL path.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclEnums.h#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/bifbase.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/AMDFixupKernelModule.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/SPIR/AMDSPIRLoader.cpp#91 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/SPIR/AMDSPIRLoader.h#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#177 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#192 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#42 edit

rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp

@@ -2245,6 +2245,16 @@ if_aclQueryInfo(aclCompiler *cl,
         return ACL_SUCCESS;
       }
       return ACL_ERROR;
+    case RT_CONTAINS_SPIR:
+      if (!ptr) {
+        *size = sizeof(bool);
+        return ACL_SUCCESS;
+      } else if (*size >= sizeof(bool)) {
+        bool contains = elfBin->isSection(aclSPIR);
+        memcpy(ptr, &contains, sizeof(bool));
+        return ACL_SUCCESS;
+      }
+      return ACL_ERROR;
     case RT_CONTAINS_OPTIONS:
       if (!ptr) {
         *size = sizeof(bool);

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

@@ -209,7 +209,8 @@ typedef enum _rt_query_types_enum_0_8 {
   RT_CONTAINS_HSAIL      = 18,
   RT_CONTAINS_ISA        = 19,
   RT_CONTAINS_LOADER_MAP = 20,
-  RT_LAST_TYPE           = 21
+  RT_CONTAINS_SPIR       = 21,
+  RT_LAST_TYPE           = 22
 } aclQueryType_0_8;
 
 //! An enumeration for the various GPU capabilities