Skip to content

Commit 4e729d3

Browse files
DmitryBushevigcbot
authored andcommitted
Promote spirv-llvm-translator revision
Promote llvm-spirv component revision in manifest bringing new changes to IGC
1 parent 271d771 commit 4e729d3

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

IGC/VectorCompiler/cmake/spirv.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ else()
151151
set(SPRIV_BRANCH_PATCH spirvdll_100)
152152
elseif(${LLVM_VERSION_MAJOR} EQUAL 11)
153153
message(STATUS "[VC] Found LLVM version 11")
154-
set(SPIRV_REV_PATCH c67e6f26a7285aa753598ef792593ac4a545adf9)
154+
set(SPIRV_REV_PATCH d8d516efa27a8b3d9c40d8c78390c5c53c6e99d6)
155155
set(SPRIV_PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/spirv-patches-11/)
156156
set(SPRIV_BRANCH_PATCH spirvdll_110)
157157
elseif(${LLVM_VERSION_MAJOR} EQUAL 12)
158158
message(STATUS "[VC] Found LLVM version 12")
159-
set(SPIRV_REV_PATCH 67d3e271a28287b2c92ecef2f5e98c49134e5946)
159+
set(SPIRV_REV_PATCH a61eb54d84d7f01311cafddb19107305b9e7c09b)
160160
set(SPRIV_PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/spirv-patches-12/)
161161
set(SPRIV_BRANCH_PATCH spirvdll_120)
162162
elseif(${LLVM_VERSION_MAJOR} EQUAL 13)

IGC/VectorCompiler/spirv-patches-11/0001-Add-DecorationFuncParamKindINTEL-and-DecorationFuncP.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,22 @@ index 00000000..00000000 100644
149149
ADD_VEC_INIT(DecorationCallableFunctionINTEL, {CapabilityFastCompositeINTEL});
150150
+ ADD_VEC_INIT(DecorationFuncParamKindINTEL, {CapabilityVectorComputeINTEL});
151151
+ ADD_VEC_INIT(DecorationFuncParamDescINTEL, {CapabilityVectorComputeINTEL});
152-
}
153-
154-
template <> inline void SPIRVMap<BuiltIn, SPIRVCapVec>::init() {
152+
ADD_VEC_INIT(internal::DecorationAliasScopeINTEL,
153+
{internal::CapabilityMemoryAccessAliasingINTEL});
154+
ADD_VEC_INIT(internal::DecorationNoAliasINTEL,
155155
diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
156156
index 00000000..00000000 100644
157157
--- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
158158
+++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
159159
@@ -165,6 +165,8 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
160+
add(DecorationFunctionFloatingPointModeINTEL,
160161
"FunctionFloatingPointModeINTEL");
161162
add(DecorationSingleElementVectorINTEL, "SingleElementVectorINTEL");
162-
add(DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
163163
+ add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
164164
+ add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
165-
add(DecorationMax, "Max");
166-
}
167-
SPIRV_DEF_NAMEMAP(Decoration, SPIRVDecorationNameMap)
165+
166+
// From spirv_internal.hpp
167+
add(DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
168168
diff --git a/lib/SPIRV/libSPIRV/spirv.hpp b/lib/SPIRV/libSPIRV/spirv.hpp
169169
index 00000000..00000000 100644
170170
--- a/lib/SPIRV/libSPIRV/spirv.hpp

IGC/VectorCompiler/spirv-patches-12/0001-Add-DecorationFuncParamKindINTEL-and-DecorationFuncP.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ index 00000000..00000000 100644
149149
ADD_VEC_INIT(DecorationFuseLoopsInFunctionINTEL, {CapabilityLoopFuseINTEL});
150150
+ ADD_VEC_INIT(DecorationFuncParamKindINTEL, {CapabilityVectorComputeINTEL});
151151
+ ADD_VEC_INIT(DecorationFuncParamDescINTEL, {CapabilityVectorComputeINTEL});
152-
}
153-
154-
template <> inline void SPIRVMap<BuiltIn, SPIRVCapVec>::init() {
152+
ADD_VEC_INIT(internal::DecorationAliasScopeINTEL,
153+
{internal::CapabilityMemoryAccessAliasingINTEL});
154+
ADD_VEC_INIT(internal::DecorationNoAliasINTEL,
155155
diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
156156
index 00000000..00000000 100644
157157
--- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
@@ -162,9 +162,9 @@ index 00000000..00000000 100644
162162
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
163163
+ add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
164164
+ add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
165+
add(internal::DecorationAliasScopeINTEL, "AliasScopeINTEL");
166+
add(internal::DecorationNoAliasINTEL, "NoAliasINTEL");
165167
add(DecorationMax, "Max");
166-
}
167-
SPIRV_DEF_NAMEMAP(Decoration, SPIRVDecorationNameMap)
168168
diff --git a/lib/SPIRV/libSPIRV/spirv.hpp b/lib/SPIRV/libSPIRV/spirv.hpp
169169
index 00000000..00000000 100644
170170
--- a/lib/SPIRV/libSPIRV/spirv.hpp

0 commit comments

Comments
 (0)