Add SPIR-V 1.2 support, for OpenCL 2.2

alan-baker · May 15, 2017 · dbc2049 · dbc2049
1 parent eb720b2
commit dbc2049
Show file tree

Hide file tree

Showing 34 changed files with 143 additions and 57 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 Revision history for SPIRV-Tools
 
 v2016.7-dev 2017-01-06
+ - Add SPIR-V 1.2
+ - OpenCL 2.2 support is now based on SPIR-V 1.2
  - Optimizer: Add inlining of all function calls in entry points.
  - Optimizer: Add flattening of decoration groups.  Fixes #602
  - Optimizer: Add Id compaction (minimize Id bound).  Fixes #624

diff --git a/include/spirv-tools/libspirv.h b/include/spirv-tools/libspirv.h
@@ -378,7 +378,8 @@ typedef enum {
   SPV_ENV_OPENGL_4_2,     // OpenGL 4.2 plus GL_ARB_gl_spirv, latest revisions.
   SPV_ENV_OPENGL_4_3,     // OpenGL 4.3 plus GL_ARB_gl_spirv, latest revisions.
   // There is no variant for OpenGL 4.4.
-  SPV_ENV_OPENGL_4_5,  // OpenGL 4.5 plus GL_ARB_gl_spirv, latest revisions.
+  SPV_ENV_OPENGL_4_5,     // OpenGL 4.5 plus GL_ARB_gl_spirv, latest revisions.
+  SPV_ENV_UNIVERSAL_1_2,  // SPIR-V 1.2, latest revision, no other restrictions.
 } spv_target_env;
 
 // SPIR-V Validator can be parameterized with the following Universal Limits.

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -111,12 +111,13 @@ endmacro(spvtools_vendor_tables)
 
 spvtools_core_tables("1.0")
 spvtools_core_tables("1.1")
-spvtools_enum_string_mapping("1.1")
+spvtools_core_tables("1.2")
+spvtools_enum_string_mapping("1.2")
 spvtools_opencl_tables("1.0")
 spvtools_glsl_tables("1.0")
 spvtools_vendor_tables("spv-amd-gcn-shader")
 
-spvtools_vimsyntax("1.1" "1.0")
+spvtools_vimsyntax("1.2" "1.0")
 add_custom_target(spirv-tools-vimsyntax DEPENDS ${VIMSYNTAX_FILE})
 set_property(TARGET spirv-tools-vimsyntax PROPERTY FOLDER "SPIRV-Tools utilities")
 

diff --git a/source/assembly_grammar.h b/source/assembly_grammar.h
@@ -17,7 +17,7 @@
 
 #include "operand.h"
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 #include "table.h"
 
 namespace libspirv {

diff --git a/source/binary.cpp b/source/binary.cpp
@@ -27,7 +27,7 @@
 #include "ext_inst.h"
 #include "opcode.h"
 #include "operand.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 #include "spirv_constant.h"
 #include "spirv_endian.h"
 

diff --git a/source/enum_set.h b/source/enum_set.h
@@ -21,7 +21,7 @@
 #include <set>
 #include <utility>
 
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 namespace libspirv {
 

diff --git a/source/ext_inst.cpp b/source/ext_inst.cpp
@@ -56,6 +56,7 @@ spv_result_t spvExtInstTableGet(spv_ext_inst_table* pExtInstTable,
     case SPV_ENV_UNIVERSAL_1_0:
     case SPV_ENV_VULKAN_1_0:
     case SPV_ENV_UNIVERSAL_1_1:
+    case SPV_ENV_UNIVERSAL_1_2:
     case SPV_ENV_OPENCL_2_1:
     case SPV_ENV_OPENCL_2_2:
     case SPV_ENV_OPENGL_4_0:

diff --git a/source/instruction.h b/source/instruction.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 // Describes an instruction.
 struct spv_instruction_t {

diff --git a/source/name_mapper.cpp b/source/name_mapper.cpp
@@ -23,7 +23,7 @@
 #include <unordered_set>
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 #include "parsed_operand.h"
 

diff --git a/source/opcode.cpp b/source/opcode.cpp
@@ -36,6 +36,9 @@ const spv_opcode_desc_t opcodeTableEntries_1_0[] = {
 const spv_opcode_desc_t opcodeTableEntries_1_1[] = {
 #include "core.insts-1.1.inc"
 };
+const spv_opcode_desc_t opcodeTableEntries_1_2[] = {
+#include "core.insts-1.2.inc"
+};
 
 // Represents a vendor tool entry in the SPIR-V XML Regsitry.
 struct VendorTool {
@@ -83,6 +86,8 @@ spv_result_t spvOpcodeTableGet(spv_opcode_table* pInstTable,
       ARRAY_SIZE(opcodeTableEntries_1_0), opcodeTableEntries_1_0};
   static const spv_opcode_table_t table_1_1 = {
       ARRAY_SIZE(opcodeTableEntries_1_1), opcodeTableEntries_1_1};
+  static const spv_opcode_table_t table_1_2 = {
+      ARRAY_SIZE(opcodeTableEntries_1_2), opcodeTableEntries_1_2};
 
   switch (env) {
     case SPV_ENV_UNIVERSAL_1_0:
@@ -96,9 +101,12 @@ spv_result_t spvOpcodeTableGet(spv_opcode_table* pInstTable,
       *pInstTable = &table_1_0;
       return SPV_SUCCESS;
     case SPV_ENV_UNIVERSAL_1_1:
-    case SPV_ENV_OPENCL_2_2:
       *pInstTable = &table_1_1;
       return SPV_SUCCESS;
+    case SPV_ENV_UNIVERSAL_1_2:
+    case SPV_ENV_OPENCL_2_2:
+      *pInstTable = &table_1_2;
+      return SPV_SUCCESS;
   }
   assert(0 && "Unknown spv_target_env in spvOpcodeTableGet()");
   return SPV_ERROR_INVALID_TABLE;
@@ -165,9 +173,9 @@ void spvInstructionCopy(const uint32_t* words, const SpvOp opcode,
 const char* spvOpcodeString(const SpvOp opcode) {
   // Use the latest SPIR-V version, which should be backward-compatible with all
   // previous ones.
-  for (uint32_t i = 0; i < ARRAY_SIZE(opcodeTableEntries_1_1); ++i) {
-    if (opcodeTableEntries_1_1[i].opcode == opcode)
-      return opcodeTableEntries_1_1[i].name;
+  for (uint32_t i = 0; i < ARRAY_SIZE(opcodeTableEntries_1_2); ++i) {
+    if (opcodeTableEntries_1_2[i].opcode == opcode)
+      return opcodeTableEntries_1_2[i].name;
   }
   assert(0 && "Unreachable!");
   return "unknown";

diff --git a/source/opcode.h b/source/opcode.h
@@ -17,7 +17,7 @@
 
 #include "instruction.h"
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 #include "table.h"
 
 // Returns the name of a registered SPIR-V generator as a null-terminated

diff --git a/source/operand.cpp b/source/operand.cpp
@@ -26,6 +26,9 @@ namespace v1_0 {
 namespace v1_1 {
 #include "operand.kinds-1.1.inc"
 }  // namespace v1_1
+namespace v1_2 {
+#include "operand.kinds-1.2.inc"
+}  // namespace v1_2
 
 spv_result_t spvOperandTableGet(spv_operand_table* pOperandTable,
                                 spv_target_env env) {
@@ -37,6 +40,9 @@ spv_result_t spvOperandTableGet(spv_operand_table* pOperandTable,
   static const spv_operand_table_t table_1_1 = {
       ARRAY_SIZE(v1_1::pygen_variable_OperandInfoTable),
       v1_1::pygen_variable_OperandInfoTable};
+  static const spv_operand_table_t table_1_2 = {
+      ARRAY_SIZE(v1_2::pygen_variable_OperandInfoTable),
+      v1_2::pygen_variable_OperandInfoTable};
 
   switch (env) {
     case SPV_ENV_UNIVERSAL_1_0:
@@ -50,9 +56,12 @@ spv_result_t spvOperandTableGet(spv_operand_table* pOperandTable,
       *pOperandTable = &table_1_0;
       return SPV_SUCCESS;
     case SPV_ENV_UNIVERSAL_1_1:
-    case SPV_ENV_OPENCL_2_2:
       *pOperandTable = &table_1_1;
       return SPV_SUCCESS;
+    case SPV_ENV_UNIVERSAL_1_2:
+    case SPV_ENV_OPENCL_2_2:
+      *pOperandTable = &table_1_2;
+      return SPV_SUCCESS;
   }
   assert(0 && "Unknown spv_target_env in spvOperandTableGet()");
   return SPV_ERROR_INVALID_TABLE;

diff --git a/source/opt/instruction.h b/source/opt/instruction.h
@@ -23,7 +23,7 @@
 #include "operand.h"
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 namespace spvtools {
 namespace ir {

diff --git a/source/opt/reflect.h b/source/opt/reflect.h
@@ -15,7 +15,7 @@
 #ifndef LIBSPIRV_OPT_REFLECT_H_
 #define LIBSPIRV_OPT_REFLECT_H_
 
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 namespace spvtools {
 namespace ir {

diff --git a/source/opt/types.h b/source/opt/types.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 namespace spvtools {
 namespace opt {

diff --git a/source/spirv_constant.h b/source/spirv_constant.h
@@ -16,7 +16,7 @@
 #define LIBSPIRV_SPIRV_CONSTANT_H_
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 // Version number macros.
 

diff --git a/source/spirv_definition.h b/source/spirv_definition.h
@@ -17,7 +17,7 @@
 
 #include <cstdint>
 
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 #define spvIsInBitfield(value, bitfield) ((value) == ((value)&bitfield))
 

diff --git a/source/spirv_target_env.cpp b/source/spirv_target_env.cpp
@@ -40,6 +40,8 @@ const char* spvTargetEnvDescription(spv_target_env env) {
       return "SPIR-V 1.0 (under OpenCL 4.3 semantics)";
     case SPV_ENV_OPENGL_4_5:
       return "SPIR-V 1.0 (under OpenCL 4.5 semantics)";
+    case SPV_ENV_UNIVERSAL_1_2:
+      return "SPIR-V 1.2";
   }
   assert(0 && "Unhandled SPIR-V target environment");
   return "";
@@ -57,8 +59,10 @@ uint32_t spvVersionForTargetEnv(spv_target_env env) {
     case SPV_ENV_OPENGL_4_5:
       return SPV_SPIRV_VERSION_WORD(1, 0);
     case SPV_ENV_UNIVERSAL_1_1:
-    case SPV_ENV_OPENCL_2_2:
       return SPV_SPIRV_VERSION_WORD(1, 1);
+    case SPV_ENV_UNIVERSAL_1_2:
+    case SPV_ENV_OPENCL_2_2:
+      return SPV_SPIRV_VERSION_WORD(1, 2);
   }
   assert(0 && "Unhandled SPIR-V target environment");
   return SPV_SPIRV_VERSION_WORD(0, 0);
@@ -77,6 +81,9 @@ bool spvParseTargetEnv(const char* s, spv_target_env* env) {
   } else if (match("spv1.1")) {
     if (env) *env = SPV_ENV_UNIVERSAL_1_1;
     return true;
+  } else if (match("spv1.2")) {
+    if (env) *env = SPV_ENV_UNIVERSAL_1_2;
+    return true;
   } else if (match("opencl2.1")) {
     if (env) *env = SPV_ENV_OPENCL_2_1;
     return true;

diff --git a/source/table.cpp b/source/table.cpp
@@ -28,6 +28,7 @@ spv_context spvContextCreate(spv_target_env env) {
     case SPV_ENV_OPENGL_4_2:
     case SPV_ENV_OPENGL_4_3:
     case SPV_ENV_OPENGL_4_5:
+    case SPV_ENV_UNIVERSAL_1_2:
       break;
     default:
       return nullptr;

diff --git a/source/table.h b/source/table.h
@@ -15,9 +15,7 @@
 #ifndef LIBSPIRV_TABLE_H_
 #define LIBSPIRV_TABLE_H_
 
-#include <string>
-
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 #include "extensions.h"
 #include "message.h"

diff --git a/source/val/basic_block.h b/source/val/basic_block.h
@@ -15,7 +15,7 @@
 #ifndef LIBSPIRV_VAL_BASICBLOCK_H_
 #define LIBSPIRV_VAL_BASICBLOCK_H_
 
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 
 #include <cstdint>
 

diff --git a/source/val/function.h b/source/val/function.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 #include "val/basic_block.h"
 #include "val/construct.h"
 

diff --git a/source/val/validation_state.h b/source/val/validation_state.h
@@ -27,7 +27,7 @@
 #include "diagnostic.h"
 #include "enum_set.h"
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.1/spirv.h"
+#include "spirv/1.2/spirv.h"
 #include "spirv_definition.h"
 #include "val/function.h"
 #include "val/instruction.h"

diff --git a/test/binary_header_get_test.cpp b/test/binary_header_get_test.cpp
@@ -50,7 +50,7 @@ TEST_F(BinaryHeaderGet, Default) {
   ASSERT_EQ(SPV_SUCCESS, spvBinaryHeaderGet(&const_bin, endian, &header));
 
   ASSERT_EQ(static_cast<uint32_t>(SpvMagicNumber), header.magic);
-  ASSERT_EQ(0x00010100u, header.version);
+  ASSERT_EQ(0x00010200u, header.version);
   ASSERT_EQ(static_cast<uint32_t>(SPV_GENERATOR_CODEPLAY), header.generator);
   ASSERT_EQ(1u, header.bound);
   ASSERT_EQ(0u, header.schema);