From a47fe5e15f96f347777201cf793ac324c4e99d63 Mon Sep 17 00:00:00 2001 From: "Sidorov, Dmitry" Date: Tue, 24 Sep 2024 03:03:17 -0700 Subject: [PATCH] Rename SPV_INTEL_optnone to SPV_EXT_optnone Signed-off-by: Sidorov, Dmitry --- include/spirv/unified1/spirv.bf | 6 +++--- include/spirv/unified1/spirv.core.grammar.json | 8 ++++---- include/spirv/unified1/spirv.cs | 6 +++--- include/spirv/unified1/spirv.h | 8 ++++---- include/spirv/unified1/spirv.hpp | 8 ++++---- include/spirv/unified1/spirv.hpp11 | 8 ++++---- include/spirv/unified1/spirv.json | 4 ++-- include/spirv/unified1/spirv.lua | 6 +++--- include/spirv/unified1/spirv.py | 6 +++--- include/spirv/unified1/spv.d | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf index 453a3a246..65fe67934 100644 --- a/include/spirv/unified1/spirv.bf +++ b/include/spirv/unified1/spirv.bf @@ -871,7 +871,7 @@ namespace Spv DontInline = 1, Pure = 2, Const = 3, - OptNoneINTEL = 16, + OptNoneEXT = 16, Max = 0x7fffffff, } @@ -882,7 +882,7 @@ namespace Spv DontInline = 0x00000002, Pure = 0x00000004, Const = 0x00000008, - OptNoneINTEL = 0x00010000, + OptNoneEXT = 0x00010000, } [AllowDuplicates, CRepr] public enum MemorySemanticsShift @@ -1256,7 +1256,7 @@ namespace Spv AtomicFloat32AddEXT = 6033, AtomicFloat64AddEXT = 6034, LongCompositesINTEL = 6089, - OptNoneINTEL = 6094, + OptNoneEXT = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115, diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index d56296436..e99dad36f 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -10518,9 +10518,9 @@ "version" : "1.0" }, { - "enumerant" : "OptNoneINTEL", + "enumerant" : "OptNoneEXT", "value" : "0x10000", - "capabilities" : [ "OptNoneINTEL" ], + "capabilities" : [ "OptNoneEXT" ], "version" : "None" } ] @@ -16712,9 +16712,9 @@ "version" : "None" }, { - "enumerant" : "OptNoneINTEL", + "enumerant" : "OptNoneEXT", "value" : 6094, - "extensions" : [ "SPV_INTEL_optnone" ], + "extensions" : [ "SPV_EXT_optnone" ], "version" : "None" }, { diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index dfdbac6d0..00f91efaf 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -870,7 +870,7 @@ public enum FunctionControlShift DontInline = 1, Pure = 2, Const = 3, - OptNoneINTEL = 16, + OptNoneEXT = 16, Max = 0x7fffffff, } @@ -881,7 +881,7 @@ public enum FunctionControlMask DontInline = 0x00000002, Pure = 0x00000004, Const = 0x00000008, - OptNoneINTEL = 0x00010000, + OptNoneEXT = 0x00010000, } public enum MemorySemanticsShift @@ -1255,7 +1255,7 @@ public enum Capability AtomicFloat32AddEXT = 6033, AtomicFloat64AddEXT = 6034, LongCompositesINTEL = 6089, - OptNoneINTEL = 6094, + OptNoneEXT = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115, diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index 92096ec1f..724710605 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -852,7 +852,7 @@ typedef enum SpvFunctionControlShift_ { SpvFunctionControlDontInlineShift = 1, SpvFunctionControlPureShift = 2, SpvFunctionControlConstShift = 3, - SpvFunctionControlOptNoneINTELShift = 16, + SpvFunctionControlOptNoneEXTShift = 16, SpvFunctionControlMax = 0x7fffffff, } SpvFunctionControlShift; @@ -862,7 +862,7 @@ typedef enum SpvFunctionControlMask_ { SpvFunctionControlDontInlineMask = 0x00000002, SpvFunctionControlPureMask = 0x00000004, SpvFunctionControlConstMask = 0x00000008, - SpvFunctionControlOptNoneINTELMask = 0x00010000, + SpvFunctionControlOptNoneEXTMask = 0x00010000, } SpvFunctionControlMask; typedef enum SpvMemorySemanticsShift_ { @@ -1226,7 +1226,7 @@ typedef enum SpvCapability_ { SpvCapabilityAtomicFloat32AddEXT = 6033, SpvCapabilityAtomicFloat64AddEXT = 6034, SpvCapabilityLongCompositesINTEL = 6089, - SpvCapabilityOptNoneINTEL = 6094, + SpvCapabilityOptNoneEXT = 6094, SpvCapabilityAtomicFloat16AddEXT = 6095, SpvCapabilityDebugInfoModuleINTEL = 6114, SpvCapabilityBFloat16ConversionINTEL = 6115, @@ -3823,7 +3823,7 @@ inline const char* SpvCapabilityToString(SpvCapability value) { case SpvCapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; case SpvCapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; case SpvCapabilityLongCompositesINTEL: return "LongCompositesINTEL"; - case SpvCapabilityOptNoneINTEL: return "OptNoneINTEL"; + case SpvCapabilityOptNoneEXT: return "OptNoneEXT"; case SpvCapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; case SpvCapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; case SpvCapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 106501303..396ce0ca3 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -848,7 +848,7 @@ enum FunctionControlShift { FunctionControlDontInlineShift = 1, FunctionControlPureShift = 2, FunctionControlConstShift = 3, - FunctionControlOptNoneINTELShift = 16, + FunctionControlOptNoneEXTShift = 16, FunctionControlMax = 0x7fffffff, }; @@ -858,7 +858,7 @@ enum FunctionControlMask { FunctionControlDontInlineMask = 0x00000002, FunctionControlPureMask = 0x00000004, FunctionControlConstMask = 0x00000008, - FunctionControlOptNoneINTELMask = 0x00010000, + FunctionControlOptNoneEXTMask = 0x00010000, }; enum MemorySemanticsShift { @@ -1222,7 +1222,7 @@ enum Capability { CapabilityAtomicFloat32AddEXT = 6033, CapabilityAtomicFloat64AddEXT = 6034, CapabilityLongCompositesINTEL = 6089, - CapabilityOptNoneINTEL = 6094, + CapabilityOptNoneEXT = 6094, CapabilityAtomicFloat16AddEXT = 6095, CapabilityDebugInfoModuleINTEL = 6114, CapabilityBFloat16ConversionINTEL = 6115, @@ -3819,7 +3819,7 @@ inline const char* CapabilityToString(Capability value) { case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; case CapabilityLongCompositesINTEL: return "LongCompositesINTEL"; - case CapabilityOptNoneINTEL: return "OptNoneINTEL"; + case CapabilityOptNoneEXT: return "OptNoneEXT"; case CapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; case CapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; case CapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index 22e45f53b..1d1775d48 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -848,7 +848,7 @@ enum class FunctionControlShift : unsigned { DontInline = 1, Pure = 2, Const = 3, - OptNoneINTEL = 16, + OptNoneEXT = 16, Max = 0x7fffffff, }; @@ -858,7 +858,7 @@ enum class FunctionControlMask : unsigned { DontInline = 0x00000002, Pure = 0x00000004, Const = 0x00000008, - OptNoneINTEL = 0x00010000, + OptNoneEXT = 0x00010000, }; enum class MemorySemanticsShift : unsigned { @@ -1222,7 +1222,7 @@ enum class Capability : unsigned { AtomicFloat32AddEXT = 6033, AtomicFloat64AddEXT = 6034, LongCompositesINTEL = 6089, - OptNoneINTEL = 6094, + OptNoneEXT = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115, @@ -3819,7 +3819,7 @@ inline const char* CapabilityToString(Capability value) { case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; case CapabilityLongCompositesINTEL: return "LongCompositesINTEL"; - case CapabilityOptNoneINTEL: return "OptNoneINTEL"; + case CapabilityOptNoneEXT: return "OptNoneEXT"; case CapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; case CapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; case CapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index 161deff16..968f4e8be 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -854,7 +854,7 @@ "DontInline": 1, "Pure": 2, "Const": 3, - "OptNoneINTEL": 16 + "OptNoneEXT": 16 } }, { @@ -1199,7 +1199,7 @@ "AtomicFloat32AddEXT": 6033, "AtomicFloat64AddEXT": 6034, "LongCompositesINTEL": 6089, - "OptNoneINTEL": 6094, + "OptNoneEXT": 6094, "AtomicFloat16AddEXT": 6095, "DebugInfoModuleINTEL": 6114, "BFloat16ConversionINTEL": 6115, diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index 28c5e4025..794eb7cd6 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -839,7 +839,7 @@ spv = { DontInline = 1, Pure = 2, Const = 3, - OptNoneINTEL = 16, + OptNoneEXT = 16, Max = 0x7fffffff, }, @@ -849,7 +849,7 @@ spv = { DontInline = 0x00000002, Pure = 0x00000004, Const = 0x00000008, - OptNoneINTEL = 0x00010000, + OptNoneEXT = 0x00010000, }, MemorySemanticsShift = { @@ -1213,7 +1213,7 @@ spv = { AtomicFloat32AddEXT = 6033, AtomicFloat64AddEXT = 6034, LongCompositesINTEL = 6089, - OptNoneINTEL = 6094, + OptNoneEXT = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115, diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index bb78fe35d..c004bfe07 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -817,7 +817,7 @@ 'DontInline' : 1, 'Pure' : 2, 'Const' : 3, - 'OptNoneINTEL' : 16, + 'OptNoneEXT' : 16, }, 'FunctionControlMask' : { @@ -826,7 +826,7 @@ 'DontInline' : 0x00000002, 'Pure' : 0x00000004, 'Const' : 0x00000008, - 'OptNoneINTEL' : 0x00010000, + 'OptNoneEXT' : 0x00010000, }, 'MemorySemanticsShift' : { @@ -1184,7 +1184,7 @@ 'AtomicFloat32AddEXT' : 6033, 'AtomicFloat64AddEXT' : 6034, 'LongCompositesINTEL' : 6089, - 'OptNoneINTEL' : 6094, + 'OptNoneEXT' : 6094, 'AtomicFloat16AddEXT' : 6095, 'DebugInfoModuleINTEL' : 6114, 'BFloat16ConversionINTEL' : 6115, diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d index daf252350..10cd25010 100644 --- a/include/spirv/unified1/spv.d +++ b/include/spirv/unified1/spv.d @@ -873,7 +873,7 @@ enum FunctionControlShift : uint DontInline = 1, Pure = 2, Const = 3, - OptNoneINTEL = 16, + OptNoneEXT = 16, Max = 0x7fffffff, } @@ -884,7 +884,7 @@ enum FunctionControlMask : uint DontInline = 0x00000002, Pure = 0x00000004, Const = 0x00000008, - OptNoneINTEL = 0x00010000, + OptNoneEXT = 0x00010000, } enum MemorySemanticsShift : uint @@ -1258,7 +1258,7 @@ enum Capability : uint AtomicFloat32AddEXT = 6033, AtomicFloat64AddEXT = 6034, LongCompositesINTEL = 6089, - OptNoneINTEL = 6094, + OptNoneEXT = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115,