334 lines
12 KiB
Diff
334 lines
12 KiB
Diff
|
From 0413bc33faa7d85d8619c119661c09774bb47654 Mon Sep 17 00:00:00 2001
|
||
|
From: Dmitry Sidorov <dmitry.sidorov@intel.com>
|
||
|
Date: Wed, 25 Sep 2024 18:01:03 +0200
|
||
|
Subject: [PATCH 1/2] Add SPV_EXT_optnone (#449)
|
||
|
|
||
|
* Rename SPV_INTEL_optnone to SPV_EXT_optnone
|
||
|
|
||
|
Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
|
||
|
|
||
|
* keep intel names as well
|
||
|
|
||
|
Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
|
||
|
|
||
|
---------
|
||
|
|
||
|
Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
|
||
|
---
|
||
|
include/spirv/unified1/spirv.bf | 3 +++
|
||
|
include/spirv/unified1/spirv.core.grammar.json | 12 ++++++++++++
|
||
|
include/spirv/unified1/spirv.cs | 3 +++
|
||
|
include/spirv/unified1/spirv.h | 5 ++++-
|
||
|
include/spirv/unified1/spirv.hpp | 5 ++++-
|
||
|
include/spirv/unified1/spirv.hpp11 | 5 ++++-
|
||
|
include/spirv/unified1/spirv.json | 2 ++
|
||
|
include/spirv/unified1/spirv.lua | 3 +++
|
||
|
include/spirv/unified1/spirv.py | 3 +++
|
||
|
include/spirv/unified1/spv.d | 3 +++
|
||
|
10 files changed, 41 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
|
||
|
index 453a3a2..fc66285 100644
|
||
|
--- a/include/spirv/unified1/spirv.bf
|
||
|
+++ b/include/spirv/unified1/spirv.bf
|
||
|
@@ -871,6 +871,7 @@ namespace Spv
|
||
|
DontInline = 1,
|
||
|
Pure = 2,
|
||
|
Const = 3,
|
||
|
+ OptNoneEXT = 16,
|
||
|
OptNoneINTEL = 16,
|
||
|
Max = 0x7fffffff,
|
||
|
}
|
||
|
@@ -882,6 +883,7 @@ namespace Spv
|
||
|
DontInline = 0x00000002,
|
||
|
Pure = 0x00000004,
|
||
|
Const = 0x00000008,
|
||
|
+ OptNoneEXT = 0x00010000,
|
||
|
OptNoneINTEL = 0x00010000,
|
||
|
}
|
||
|
|
||
|
@@ -1256,6 +1258,7 @@ namespace Spv
|
||
|
AtomicFloat32AddEXT = 6033,
|
||
|
AtomicFloat64AddEXT = 6034,
|
||
|
LongCompositesINTEL = 6089,
|
||
|
+ OptNoneEXT = 6094,
|
||
|
OptNoneINTEL = 6094,
|
||
|
AtomicFloat16AddEXT = 6095,
|
||
|
DebugInfoModuleINTEL = 6114,
|
||
|
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
|
||
|
index d562964..25bb306 100644
|
||
|
--- a/include/spirv/unified1/spirv.core.grammar.json
|
||
|
+++ b/include/spirv/unified1/spirv.core.grammar.json
|
||
|
@@ -10517,6 +10517,12 @@
|
||
|
"value" : "0x0008",
|
||
|
"version" : "1.0"
|
||
|
},
|
||
|
+ {
|
||
|
+ "enumerant" : "OptNoneEXT",
|
||
|
+ "value" : "0x10000",
|
||
|
+ "capabilities" : [ "OptNoneEXT" ],
|
||
|
+ "version" : "None"
|
||
|
+ },
|
||
|
{
|
||
|
"enumerant" : "OptNoneINTEL",
|
||
|
"value" : "0x10000",
|
||
|
@@ -16711,6 +16717,12 @@
|
||
|
"extensions" : [ "SPV_INTEL_long_composites" ],
|
||
|
"version" : "None"
|
||
|
},
|
||
|
+ {
|
||
|
+ "enumerant" : "OptNoneEXT",
|
||
|
+ "value" : 6094,
|
||
|
+ "extensions" : [ "SPV_EXT_optnone" ],
|
||
|
+ "version" : "None"
|
||
|
+ },
|
||
|
{
|
||
|
"enumerant" : "OptNoneINTEL",
|
||
|
"value" : 6094,
|
||
|
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
|
||
|
index dfdbac6..b06bab7 100644
|
||
|
--- a/include/spirv/unified1/spirv.cs
|
||
|
+++ b/include/spirv/unified1/spirv.cs
|
||
|
@@ -870,6 +870,7 @@ namespace Spv
|
||
|
DontInline = 1,
|
||
|
Pure = 2,
|
||
|
Const = 3,
|
||
|
+ OptNoneEXT = 16,
|
||
|
OptNoneINTEL = 16,
|
||
|
Max = 0x7fffffff,
|
||
|
}
|
||
|
@@ -881,6 +882,7 @@ namespace Spv
|
||
|
DontInline = 0x00000002,
|
||
|
Pure = 0x00000004,
|
||
|
Const = 0x00000008,
|
||
|
+ OptNoneEXT = 0x00010000,
|
||
|
OptNoneINTEL = 0x00010000,
|
||
|
}
|
||
|
|
||
|
@@ -1255,6 +1257,7 @@ namespace Spv
|
||
|
AtomicFloat32AddEXT = 6033,
|
||
|
AtomicFloat64AddEXT = 6034,
|
||
|
LongCompositesINTEL = 6089,
|
||
|
+ OptNoneEXT = 6094,
|
||
|
OptNoneINTEL = 6094,
|
||
|
AtomicFloat16AddEXT = 6095,
|
||
|
DebugInfoModuleINTEL = 6114,
|
||
|
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
|
||
|
index 92096ec..00f5ab3 100644
|
||
|
--- a/include/spirv/unified1/spirv.h
|
||
|
+++ b/include/spirv/unified1/spirv.h
|
||
|
@@ -852,6 +852,7 @@ typedef enum SpvFunctionControlShift_ {
|
||
|
SpvFunctionControlDontInlineShift = 1,
|
||
|
SpvFunctionControlPureShift = 2,
|
||
|
SpvFunctionControlConstShift = 3,
|
||
|
+ SpvFunctionControlOptNoneEXTShift = 16,
|
||
|
SpvFunctionControlOptNoneINTELShift = 16,
|
||
|
SpvFunctionControlMax = 0x7fffffff,
|
||
|
} SpvFunctionControlShift;
|
||
|
@@ -862,6 +863,7 @@ typedef enum SpvFunctionControlMask_ {
|
||
|
SpvFunctionControlDontInlineMask = 0x00000002,
|
||
|
SpvFunctionControlPureMask = 0x00000004,
|
||
|
SpvFunctionControlConstMask = 0x00000008,
|
||
|
+ SpvFunctionControlOptNoneEXTMask = 0x00010000,
|
||
|
SpvFunctionControlOptNoneINTELMask = 0x00010000,
|
||
|
} SpvFunctionControlMask;
|
||
|
|
||
|
@@ -1226,6 +1228,7 @@ typedef enum SpvCapability_ {
|
||
|
SpvCapabilityAtomicFloat32AddEXT = 6033,
|
||
|
SpvCapabilityAtomicFloat64AddEXT = 6034,
|
||
|
SpvCapabilityLongCompositesINTEL = 6089,
|
||
|
+ SpvCapabilityOptNoneEXT = 6094,
|
||
|
SpvCapabilityOptNoneINTEL = 6094,
|
||
|
SpvCapabilityAtomicFloat16AddEXT = 6095,
|
||
|
SpvCapabilityDebugInfoModuleINTEL = 6114,
|
||
|
@@ -3823,7 +3826,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 1065013..4a8b09a 100644
|
||
|
--- a/include/spirv/unified1/spirv.hpp
|
||
|
+++ b/include/spirv/unified1/spirv.hpp
|
||
|
@@ -848,6 +848,7 @@ enum FunctionControlShift {
|
||
|
FunctionControlDontInlineShift = 1,
|
||
|
FunctionControlPureShift = 2,
|
||
|
FunctionControlConstShift = 3,
|
||
|
+ FunctionControlOptNoneEXTShift = 16,
|
||
|
FunctionControlOptNoneINTELShift = 16,
|
||
|
FunctionControlMax = 0x7fffffff,
|
||
|
};
|
||
|
@@ -858,6 +859,7 @@ enum FunctionControlMask {
|
||
|
FunctionControlDontInlineMask = 0x00000002,
|
||
|
FunctionControlPureMask = 0x00000004,
|
||
|
FunctionControlConstMask = 0x00000008,
|
||
|
+ FunctionControlOptNoneEXTMask = 0x00010000,
|
||
|
FunctionControlOptNoneINTELMask = 0x00010000,
|
||
|
};
|
||
|
|
||
|
@@ -1222,6 +1224,7 @@ enum Capability {
|
||
|
CapabilityAtomicFloat32AddEXT = 6033,
|
||
|
CapabilityAtomicFloat64AddEXT = 6034,
|
||
|
CapabilityLongCompositesINTEL = 6089,
|
||
|
+ CapabilityOptNoneEXT = 6094,
|
||
|
CapabilityOptNoneINTEL = 6094,
|
||
|
CapabilityAtomicFloat16AddEXT = 6095,
|
||
|
CapabilityDebugInfoModuleINTEL = 6114,
|
||
|
@@ -3819,7 +3822,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 22e45f5..c0b82e9 100644
|
||
|
--- a/include/spirv/unified1/spirv.hpp11
|
||
|
+++ b/include/spirv/unified1/spirv.hpp11
|
||
|
@@ -848,6 +848,7 @@ enum class FunctionControlShift : unsigned {
|
||
|
DontInline = 1,
|
||
|
Pure = 2,
|
||
|
Const = 3,
|
||
|
+ OptNoneEXT = 16,
|
||
|
OptNoneINTEL = 16,
|
||
|
Max = 0x7fffffff,
|
||
|
};
|
||
|
@@ -858,6 +859,7 @@ enum class FunctionControlMask : unsigned {
|
||
|
DontInline = 0x00000002,
|
||
|
Pure = 0x00000004,
|
||
|
Const = 0x00000008,
|
||
|
+ OptNoneEXT = 0x00010000,
|
||
|
OptNoneINTEL = 0x00010000,
|
||
|
};
|
||
|
|
||
|
@@ -1222,6 +1224,7 @@ enum class Capability : unsigned {
|
||
|
AtomicFloat32AddEXT = 6033,
|
||
|
AtomicFloat64AddEXT = 6034,
|
||
|
LongCompositesINTEL = 6089,
|
||
|
+ OptNoneEXT = 6094,
|
||
|
OptNoneINTEL = 6094,
|
||
|
AtomicFloat16AddEXT = 6095,
|
||
|
DebugInfoModuleINTEL = 6114,
|
||
|
@@ -3819,7 +3822,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 161deff..50b7a92 100644
|
||
|
--- a/include/spirv/unified1/spirv.json
|
||
|
+++ b/include/spirv/unified1/spirv.json
|
||
|
@@ -854,6 +854,7 @@
|
||
|
"DontInline": 1,
|
||
|
"Pure": 2,
|
||
|
"Const": 3,
|
||
|
+ "OptNoneEXT": 16,
|
||
|
"OptNoneINTEL": 16
|
||
|
}
|
||
|
},
|
||
|
@@ -1199,6 +1200,7 @@
|
||
|
"AtomicFloat32AddEXT": 6033,
|
||
|
"AtomicFloat64AddEXT": 6034,
|
||
|
"LongCompositesINTEL": 6089,
|
||
|
+ "OptNoneEXT": 6094,
|
||
|
"OptNoneINTEL": 6094,
|
||
|
"AtomicFloat16AddEXT": 6095,
|
||
|
"DebugInfoModuleINTEL": 6114,
|
||
|
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
|
||
|
index 28c5e40..745ce60 100644
|
||
|
--- a/include/spirv/unified1/spirv.lua
|
||
|
+++ b/include/spirv/unified1/spirv.lua
|
||
|
@@ -839,6 +839,7 @@ spv = {
|
||
|
DontInline = 1,
|
||
|
Pure = 2,
|
||
|
Const = 3,
|
||
|
+ OptNoneEXT = 16,
|
||
|
OptNoneINTEL = 16,
|
||
|
Max = 0x7fffffff,
|
||
|
},
|
||
|
@@ -849,6 +850,7 @@ spv = {
|
||
|
DontInline = 0x00000002,
|
||
|
Pure = 0x00000004,
|
||
|
Const = 0x00000008,
|
||
|
+ OptNoneEXT = 0x00010000,
|
||
|
OptNoneINTEL = 0x00010000,
|
||
|
},
|
||
|
|
||
|
@@ -1213,6 +1215,7 @@ spv = {
|
||
|
AtomicFloat32AddEXT = 6033,
|
||
|
AtomicFloat64AddEXT = 6034,
|
||
|
LongCompositesINTEL = 6089,
|
||
|
+ OptNoneEXT = 6094,
|
||
|
OptNoneINTEL = 6094,
|
||
|
AtomicFloat16AddEXT = 6095,
|
||
|
DebugInfoModuleINTEL = 6114,
|
||
|
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
|
||
|
index bb78fe3..c2c690a 100644
|
||
|
--- a/include/spirv/unified1/spirv.py
|
||
|
+++ b/include/spirv/unified1/spirv.py
|
||
|
@@ -817,6 +817,7 @@ spv = {
|
||
|
'DontInline' : 1,
|
||
|
'Pure' : 2,
|
||
|
'Const' : 3,
|
||
|
+ 'OptNoneEXT' : 16,
|
||
|
'OptNoneINTEL' : 16,
|
||
|
},
|
||
|
|
||
|
@@ -826,6 +827,7 @@ spv = {
|
||
|
'DontInline' : 0x00000002,
|
||
|
'Pure' : 0x00000004,
|
||
|
'Const' : 0x00000008,
|
||
|
+ 'OptNoneEXT' : 0x00010000,
|
||
|
'OptNoneINTEL' : 0x00010000,
|
||
|
},
|
||
|
|
||
|
@@ -1184,6 +1186,7 @@ spv = {
|
||
|
'AtomicFloat32AddEXT' : 6033,
|
||
|
'AtomicFloat64AddEXT' : 6034,
|
||
|
'LongCompositesINTEL' : 6089,
|
||
|
+ 'OptNoneEXT' : 6094,
|
||
|
'OptNoneINTEL' : 6094,
|
||
|
'AtomicFloat16AddEXT' : 6095,
|
||
|
'DebugInfoModuleINTEL' : 6114,
|
||
|
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
|
||
|
index daf2523..ea9216c 100644
|
||
|
--- a/include/spirv/unified1/spv.d
|
||
|
+++ b/include/spirv/unified1/spv.d
|
||
|
@@ -873,6 +873,7 @@ enum FunctionControlShift : uint
|
||
|
DontInline = 1,
|
||
|
Pure = 2,
|
||
|
Const = 3,
|
||
|
+ OptNoneEXT = 16,
|
||
|
OptNoneINTEL = 16,
|
||
|
Max = 0x7fffffff,
|
||
|
}
|
||
|
@@ -884,6 +885,7 @@ enum FunctionControlMask : uint
|
||
|
DontInline = 0x00000002,
|
||
|
Pure = 0x00000004,
|
||
|
Const = 0x00000008,
|
||
|
+ OptNoneEXT = 0x00010000,
|
||
|
OptNoneINTEL = 0x00010000,
|
||
|
}
|
||
|
|
||
|
@@ -1258,6 +1260,7 @@ enum Capability : uint
|
||
|
AtomicFloat32AddEXT = 6033,
|
||
|
AtomicFloat64AddEXT = 6034,
|
||
|
LongCompositesINTEL = 6089,
|
||
|
+ OptNoneEXT = 6094,
|
||
|
OptNoneINTEL = 6094,
|
||
|
AtomicFloat16AddEXT = 6095,
|
||
|
DebugInfoModuleINTEL = 6114,
|
||
|
--
|
||
|
2.46.1
|
||
|
|