Allow controling SPV-IR version in BiFModule from cmake level

Author: aratajew

IGC/AdaptorOCL/DriverInfoOCL.hpp

@@ -39,7 +39,7 @@ namespace TC
 
         bool NeedWAToTransformA32MessagesToA64() const override{ return true; }
         bool WALoadStorePatternMatch() const override { return true; }
-        bool WADisableCustomPass() const override { return false; }
+        bool WADisableCustomPass() const override { return true; }
         bool WAEnableMemOpt2ForOCL() const override { return true; }
 
         unsigned int GetLoopUnrollThreshold() const override { return  1280; }

IGC/BiFModule/CMakeLists.txt

@@ -448,6 +448,9 @@ set(FLAG "")
 if(${VME_TYPES_DEFINED})
     list(APPEND FLAG "__VME_TYPES_DEFINED__")
 endif(${VME_TYPES_DEFINED})
+if(IGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC)
+    list(APPEND FLAG "__USE_KHRONOS_SPIRV_TRANSLATOR__")
+endif(IGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC)
 
 igc_bif_find_cl_files(IGC_BUILD__BIF_OCL_COMMON_DEPENDS ${IGC_BUILD__BIF_OCL_COMMON_INC_DIRS} "${IGC_OPTION__BIF_SRC_OCL_DIR}/Implementation")
 

IGC/BiFModule/Headers/spirv.h

@@ -164,9 +164,7 @@ typedef size_t uintptr_t;
 #define M_SQRT2       0x1.6a09e667f3bcdp+0
 #define M_SQRT1_2     0x1.6a09e667f3bcdp-1
 
-#define OLD_SPIRV_BUILTINS
-
-#if defined(OLD_SPIRV_BUILTINS)
+#if !defined(__USE_KHRONOS_SPIRV_TRANSLATOR__)
 #define SPIRV_OVERLOADABLE
 #define SPIRV_BUILTIN(opcode, old_mangling, new_mangling) \
     __builtin_spirv_Op##opcode##old_mangling
@@ -262,7 +260,7 @@ typedef enum
 
 // Work-item functions
 
-#if defined(OLD_SPIRV_BUILTINS)
+#if !defined(__USE_KHRONOS_SPIRV_TRANSLATOR__)
 size_t3 __builtin_spirv_BuiltInNumWorkgroups(void);
 size_t3 __builtin_spirv_BuiltInWorkgroupSize(void);
 size_t3 __builtin_spirv_BuiltInWorkgroupId(void);
@@ -271,7 +269,7 @@ size_t3 __builtin_spirv_BuiltInGlobalInvocationId(void);
 size_t3 __builtin_spirv_BuiltInGlobalSize(void);
 size_t3 __builtin_spirv_BuiltInEnqueuedWorkgroupSize(void);
 size_t3 __builtin_spirv_BuiltInGlobalOffset(void);
-#else
+#else // defined(__USE_KHRONOS_SPIRV_TRANSLATOR__)
 size_t __attribute__((overloadable)) __spirv_BuiltInNumWorkgroups(int dimindx);
 size_t __attribute__((overloadable)) __spirv_BuiltInWorkgroupSize(int dimindx);
 size_t __attribute__((overloadable)) __spirv_BuiltInWorkgroupId(int dimindx);
@@ -280,7 +278,7 @@ size_t __attribute__((overloadable)) __spirv_BuiltInGlobalInvocationId(int dimin
 size_t __attribute__((overloadable)) __spirv_BuiltInGlobalSize(int dimindx);
 size_t __attribute__((overloadable)) __spirv_BuiltInEnqueuedWorkgroupSize(int dimindx);
 size_t __attribute__((overloadable)) __spirv_BuiltInGlobalOffset(int dimindx);
-#endif // defined(OLD_SPIRV_BUILTINS)
+#endif
 
 size_t  SPIRV_OVERLOADABLE SPIRV_BUILTIN_NO_OP(BuiltInLocalInvocationIndex, , )(void);
 size_t  SPIRV_OVERLOADABLE SPIRV_BUILTIN_NO_OP(BuiltInGlobalLinearId, , )(void);

IGC/BiFModule/Implementation/workitem.cl

@@ -133,7 +133,7 @@ uint __intel_LocalInvocationIndex()
 
 ////////////////////////
 
-#if defined(OLD_SPIRV_BUILTINS)
+#if !defined(__USE_KHRONOS_SPIRV_TRANSLATOR__)
 
 size_t3 __builtin_spirv_BuiltInNumWorkgroups()
 {
@@ -183,7 +183,7 @@ size_t3 __builtin_spirv_BuiltInGlobalOffset()
     return BuiltinVector(__builtin_IB_get_global_offset);
 }
 
-#else // not defined(OLD_SPIRV_BUILTINS)
+#else // defined(__USE_KHRONOS_SPIRV_TRANSLATOR__)
 
 size_t OVERLOADABLE __spirv_BuiltInNumWorkgroups(int dimindx)
 {
@@ -235,7 +235,7 @@ size_t OVERLOADABLE __spirv_BuiltInGlobalOffset(int dimindx)
     return __builtin_IB_get_global_offset(dimindx);
 }
 
-#endif // defined(OLD_SPIRV_BUILTINS)
+#endif
 
 size_t SPIRV_OVERLOADABLE SPIRV_BUILTIN_NO_OP(BuiltInGlobalLinearId, , )()
 {