Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename SPV_INTEL_optnone to SPV_EXT_optnone #449

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/spirv/unified1/spirv.bf
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ namespace Spv
DontInline = 1,
Pure = 2,
Const = 3,
OptNoneINTEL = 16,
OptNoneEXT = 16,
Max = 0x7fffffff,
}

Expand All @@ -882,7 +882,7 @@ namespace Spv
DontInline = 0x00000002,
Pure = 0x00000004,
Const = 0x00000008,
OptNoneINTEL = 0x00010000,
OptNoneEXT = 0x00010000,
}

[AllowDuplicates, CRepr] public enum MemorySemanticsShift
Expand Down Expand Up @@ -1256,7 +1256,7 @@ namespace Spv
AtomicFloat32AddEXT = 6033,
AtomicFloat64AddEXT = 6034,
LongCompositesINTEL = 6089,
OptNoneINTEL = 6094,
OptNoneEXT = 6094,
AtomicFloat16AddEXT = 6095,
DebugInfoModuleINTEL = 6114,
BFloat16ConversionINTEL = 6115,
Expand Down
8 changes: 4 additions & 4 deletions include/spirv/unified1/spirv.core.grammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -10518,9 +10518,9 @@
"version" : "1.0"
},
{
"enumerant" : "OptNoneINTEL",
"enumerant" : "OptNoneEXT",
"value" : "0x10000",
"capabilities" : [ "OptNoneINTEL" ],
"capabilities" : [ "OptNoneEXT" ],
"version" : "None"
}
]
Expand Down Expand Up @@ -16712,9 +16712,9 @@
"version" : "None"
},
{
"enumerant" : "OptNoneINTEL",
"enumerant" : "OptNoneEXT",
"value" : 6094,
"extensions" : [ "SPV_INTEL_optnone" ],
"extensions" : [ "SPV_EXT_optnone" ],
"version" : "None"
},
{
Expand Down
6 changes: 3 additions & 3 deletions include/spirv/unified1/spirv.cs
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ public enum FunctionControlShift
DontInline = 1,
Pure = 2,
Const = 3,
OptNoneINTEL = 16,
OptNoneEXT = 16,
Max = 0x7fffffff,
}

Expand All @@ -881,7 +881,7 @@ public enum FunctionControlMask
DontInline = 0x00000002,
Pure = 0x00000004,
Const = 0x00000008,
OptNoneINTEL = 0x00010000,
OptNoneEXT = 0x00010000,
}

public enum MemorySemanticsShift
Expand Down Expand Up @@ -1255,7 +1255,7 @@ public enum Capability
AtomicFloat32AddEXT = 6033,
AtomicFloat64AddEXT = 6034,
LongCompositesINTEL = 6089,
OptNoneINTEL = 6094,
OptNoneEXT = 6094,
AtomicFloat16AddEXT = 6095,
DebugInfoModuleINTEL = 6114,
BFloat16ConversionINTEL = 6115,
Expand Down
8 changes: 4 additions & 4 deletions include/spirv/unified1/spirv.h
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ typedef enum SpvFunctionControlShift_ {
SpvFunctionControlDontInlineShift = 1,
SpvFunctionControlPureShift = 2,
SpvFunctionControlConstShift = 3,
SpvFunctionControlOptNoneINTELShift = 16,
SpvFunctionControlOptNoneEXTShift = 16,
SpvFunctionControlMax = 0x7fffffff,
} SpvFunctionControlShift;

Expand All @@ -862,7 +862,7 @@ typedef enum SpvFunctionControlMask_ {
SpvFunctionControlDontInlineMask = 0x00000002,
SpvFunctionControlPureMask = 0x00000004,
SpvFunctionControlConstMask = 0x00000008,
SpvFunctionControlOptNoneINTELMask = 0x00010000,
SpvFunctionControlOptNoneEXTMask = 0x00010000,
} SpvFunctionControlMask;

typedef enum SpvMemorySemanticsShift_ {
Expand Down Expand Up @@ -1226,7 +1226,7 @@ typedef enum SpvCapability_ {
SpvCapabilityAtomicFloat32AddEXT = 6033,
SpvCapabilityAtomicFloat64AddEXT = 6034,
SpvCapabilityLongCompositesINTEL = 6089,
SpvCapabilityOptNoneINTEL = 6094,
SpvCapabilityOptNoneEXT = 6094,
SpvCapabilityAtomicFloat16AddEXT = 6095,
SpvCapabilityDebugInfoModuleINTEL = 6114,
SpvCapabilityBFloat16ConversionINTEL = 6115,
Expand Down Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions include/spirv/unified1/spirv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ enum FunctionControlShift {
FunctionControlDontInlineShift = 1,
FunctionControlPureShift = 2,
FunctionControlConstShift = 3,
FunctionControlOptNoneINTELShift = 16,
FunctionControlOptNoneEXTShift = 16,
FunctionControlMax = 0x7fffffff,
};

Expand All @@ -858,7 +858,7 @@ enum FunctionControlMask {
FunctionControlDontInlineMask = 0x00000002,
FunctionControlPureMask = 0x00000004,
FunctionControlConstMask = 0x00000008,
FunctionControlOptNoneINTELMask = 0x00010000,
FunctionControlOptNoneEXTMask = 0x00010000,
};

enum MemorySemanticsShift {
Expand Down Expand Up @@ -1222,7 +1222,7 @@ enum Capability {
CapabilityAtomicFloat32AddEXT = 6033,
CapabilityAtomicFloat64AddEXT = 6034,
CapabilityLongCompositesINTEL = 6089,
CapabilityOptNoneINTEL = 6094,
CapabilityOptNoneEXT = 6094,
CapabilityAtomicFloat16AddEXT = 6095,
CapabilityDebugInfoModuleINTEL = 6114,
CapabilityBFloat16ConversionINTEL = 6115,
Expand Down Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions include/spirv/unified1/spirv.hpp11
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ enum class FunctionControlShift : unsigned {
DontInline = 1,
Pure = 2,
Const = 3,
OptNoneINTEL = 16,
OptNoneEXT = 16,
Max = 0x7fffffff,
};

Expand All @@ -858,7 +858,7 @@ enum class FunctionControlMask : unsigned {
DontInline = 0x00000002,
Pure = 0x00000004,
Const = 0x00000008,
OptNoneINTEL = 0x00010000,
OptNoneEXT = 0x00010000,
};

enum class MemorySemanticsShift : unsigned {
Expand Down Expand Up @@ -1222,7 +1222,7 @@ enum class Capability : unsigned {
AtomicFloat32AddEXT = 6033,
AtomicFloat64AddEXT = 6034,
LongCompositesINTEL = 6089,
OptNoneINTEL = 6094,
OptNoneEXT = 6094,
AtomicFloat16AddEXT = 6095,
DebugInfoModuleINTEL = 6114,
BFloat16ConversionINTEL = 6115,
Expand Down Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions include/spirv/unified1/spirv.json
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@
"DontInline": 1,
"Pure": 2,
"Const": 3,
"OptNoneINTEL": 16
"OptNoneEXT": 16
}
},
{
Expand Down Expand Up @@ -1199,7 +1199,7 @@
"AtomicFloat32AddEXT": 6033,
"AtomicFloat64AddEXT": 6034,
"LongCompositesINTEL": 6089,
"OptNoneINTEL": 6094,
"OptNoneEXT": 6094,
"AtomicFloat16AddEXT": 6095,
"DebugInfoModuleINTEL": 6114,
"BFloat16ConversionINTEL": 6115,
Expand Down
6 changes: 3 additions & 3 deletions include/spirv/unified1/spirv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ spv = {
DontInline = 1,
Pure = 2,
Const = 3,
OptNoneINTEL = 16,
OptNoneEXT = 16,
Max = 0x7fffffff,
},

Expand All @@ -849,7 +849,7 @@ spv = {
DontInline = 0x00000002,
Pure = 0x00000004,
Const = 0x00000008,
OptNoneINTEL = 0x00010000,
OptNoneEXT = 0x00010000,
},

MemorySemanticsShift = {
Expand Down Expand Up @@ -1213,7 +1213,7 @@ spv = {
AtomicFloat32AddEXT = 6033,
AtomicFloat64AddEXT = 6034,
LongCompositesINTEL = 6089,
OptNoneINTEL = 6094,
OptNoneEXT = 6094,
AtomicFloat16AddEXT = 6095,
DebugInfoModuleINTEL = 6114,
BFloat16ConversionINTEL = 6115,
Expand Down
6 changes: 3 additions & 3 deletions include/spirv/unified1/spirv.py
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@
'DontInline' : 1,
'Pure' : 2,
'Const' : 3,
'OptNoneINTEL' : 16,
'OptNoneEXT' : 16,
},

'FunctionControlMask' : {
Expand All @@ -826,7 +826,7 @@
'DontInline' : 0x00000002,
'Pure' : 0x00000004,
'Const' : 0x00000008,
'OptNoneINTEL' : 0x00010000,
'OptNoneEXT' : 0x00010000,
},

'MemorySemanticsShift' : {
Expand Down Expand Up @@ -1184,7 +1184,7 @@
'AtomicFloat32AddEXT' : 6033,
'AtomicFloat64AddEXT' : 6034,
'LongCompositesINTEL' : 6089,
'OptNoneINTEL' : 6094,
'OptNoneEXT' : 6094,
'AtomicFloat16AddEXT' : 6095,
'DebugInfoModuleINTEL' : 6114,
'BFloat16ConversionINTEL' : 6115,
Expand Down
6 changes: 3 additions & 3 deletions include/spirv/unified1/spv.d
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ enum FunctionControlShift : uint
DontInline = 1,
Pure = 2,
Const = 3,
OptNoneINTEL = 16,
OptNoneEXT = 16,
Max = 0x7fffffff,
}

Expand All @@ -884,7 +884,7 @@ enum FunctionControlMask : uint
DontInline = 0x00000002,
Pure = 0x00000004,
Const = 0x00000008,
OptNoneINTEL = 0x00010000,
OptNoneEXT = 0x00010000,
}

enum MemorySemanticsShift : uint
Expand Down Expand Up @@ -1258,7 +1258,7 @@ enum Capability : uint
AtomicFloat32AddEXT = 6033,
AtomicFloat64AddEXT = 6034,
LongCompositesINTEL = 6089,
OptNoneINTEL = 6094,
OptNoneEXT = 6094,
AtomicFloat16AddEXT = 6095,
DebugInfoModuleINTEL = 6114,
BFloat16ConversionINTEL = 6115,
Expand Down