pool/spirv-llvm-translator
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1073876 from home:aaronpuchert:llvm-next

Browse Source 
- Update to version 16.0.0.
  * Compatibility with LLVM 16.
- Add Revert-Add-support-for-LLVM_LINK_LLVM_DYLIB.patch: while
  gh#KhronosGroup/SPIRV-LLVM-Translator#1543 claims to add support
  for LLVM_LINK_LLVM_DYLIB, it actually seems to break it.
- Add Revert-added-translator-support-for-SPIRV_INTEL.patch: while
  gh#KhronosGroup/SPIRV-LLVM-Translator#1632 has made it into this
  release, there is no release of spirv-headers containing the
  pendant gh#KhronosGroup/SPIRV-Headers#291 yet.

OBS-URL: https://build.opensuse.org/request/show/1073876
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/spirv-llvm-translator?expand=0&rev=3
This commit is contained in:
Stefan Dirsch 2023-03-23 12:28:31 +00:00 committed by Git OBS Bridge
parent 69560a5194
commit c7c2aa272c
6 changed files with 352 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Revert-Add-support-for-LLVM_LINK_LLVM_DYLIB.patch Normal file
View File

@ -0,0 +1,81 @@
Revert "Add support for toolchain compilation with LLVM_LINK_LLVM_DYLIB option (#1543)"
It seems this change isn't adding support but in fact removing it, as it
requires targets that are not guaranteed to exist and also forces a
static library which we don't want in openSUSE.
This reverts commit 40fd74170c4f7c1bece0e028d7662d8351ac66ff.
---
lib/SPIRV/CMakeLists.txt | 50 +++++++++++-----------------------------
1 file changed, 14 insertions(+), 36 deletions(-)
diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt
index bbef0052..0195dac2 100644
--- a/lib/SPIRV/CMakeLists.txt
+++ b/lib/SPIRV/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SRC_LIST
+add_llvm_library(LLVMSPIRVLib
LLVMSPIRVOpts.cpp
LLVMToSPIRVDbgTran.cpp
Mangler/FunctionDescriptor.cpp
@@ -37,43 +37,21 @@ set(SRC_LIST
libSPIRV/SPIRVStream.cpp
libSPIRV/SPIRVType.cpp
libSPIRV/SPIRVValue.cpp
-)
-if(LLVM_LINK_LLVM_DYLIB)
- add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
- ${SRC_LIST}
- DEPENDS
- intrinsics_gen
- LLVMAnalysis
- LLVMBitWriter
- LLVMCodeGen
- LLVMCore
- LLVMDemangle
- LLVMIRReader
- LLVMLinker
- LLVMPasses
- LLVMSupport
- LLVMTargetParser
- LLVMTransformUtils
- )
-else()
- add_llvm_library(LLVMSPIRVLib
- ${SRC_LIST}
- LINK_COMPONENTS
- Analysis
- BitWriter
- CodeGen
- Core
- Demangle
- IRReader
- Linker
- Passes
- Support
- TargetParser
- TransformUtils
+ LINK_COMPONENTS
+ Analysis
+ BitWriter
+ CodeGen
+ Core
+ Demangle
+ IRReader
+ Linker
+ Passes
+ Support
+ LLVMTargetParser
+ TransformUtils
DEPENDS
intrinsics_gen
- )
-endif()
+)
target_include_directories(LLVMSPIRVLib
PRIVATE
--
2.40.0

246
Revert-added-translator-support-for-SPIRV_INTEL.patch Normal file
View File

@ -0,0 +1,246 @@
Revert "added translator support for SPIRV_INTEL_argument_interfaces capability (#1632)"
The corresponding change KhronosGroup/SPIRV-Headers#291 is not contained
in any released version yet, so we'll have to go without this.
This reverts commit 3bc3d69c2816eda8048d835b979343013272923a.
---
include/LLVMSPIRVExtensions.inc | 1 -
lib/SPIRV/SPIRVReader.cpp | 6 --
lib/SPIRV/SPIRVWriter.cpp | 24 -------
lib/SPIRV/libSPIRV/SPIRVDecorate.h | 10 ---
lib/SPIRV/libSPIRV/SPIRVEnum.h | 18 -----
lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h | 14 ----
spirv-headers-tag.conf | 2 +-
.../sycl-kernel-arg-annotation.ll | 69 -------------------
8 files changed, 1 insertion(+), 143 deletions(-)
delete mode 100644 test/extensions/INTEL/SPV_INTEL_fpga_argument_interfaces/sycl-kernel-arg-annotation.ll
diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc
index 7ff10f52..aba67696 100644
--- a/include/LLVMSPIRVExtensions.inc
+++ b/include/LLVMSPIRVExtensions.inc
@@ -56,4 +56,3 @@ EXT(SPV_INTEL_split_barrier)
EXT(SPV_INTEL_masked_gather_scatter)
EXT(SPV_INTEL_tensor_float32_conversion)
EXT(SPV_EXT_relaxed_printf_string_address_space)
-EXT(SPV_INTEL_fpga_argument_interfaces)
diff --git a/lib/SPIRV/SPIRVReader.cpp b/lib/SPIRV/SPIRVReader.cpp
index b4c6211f..ab7dc664 100644
--- a/lib/SPIRV/SPIRVReader.cpp
+++ b/lib/SPIRV/SPIRVReader.cpp
@@ -4123,12 +4123,6 @@ bool SPIRVToLLVM::transOCLMetadata(SPIRVFunction *BF) {
return ConstantAsMetadata::get(
ConstantInt::get(Type::getInt1Ty(*Context), Literals[0]));
});
- // Generate metadata for spirv.ParameterDecorations
- addKernelArgumentMetadata(Context, SPIRV_MD_PARAMETER_DECORATIONS, BF, F,
- [=](SPIRVFunctionParameter *Arg) {
- return transDecorationsToMetadataList(
- Context, Arg->getDecorations());
- });
return true;
}
diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
index 3286731e..f9429352 100644
--- a/lib/SPIRV/SPIRVWriter.cpp
+++ b/lib/SPIRV/SPIRVWriter.cpp
@@ -2433,30 +2433,6 @@ static void transMetadataDecorations(Metadata *MD, SPIRVEntry *Target) {
TWO_INT_DECORATION_CASE(FuseLoopsInFunctionINTEL, spv, SPIRVWord,
SPIRVWord);
TWO_INT_DECORATION_CASE(MathOpDSPModeINTEL, spv, SPIRVWord, SPIRVWord);
-
- case DecorationConduitKernelArgumentINTEL:
- case DecorationRegisterMapKernelArgumentINTEL:
- case DecorationStableKernelArgumentINTEL:
- case DecorationRestrict: {
- Target->addDecorate(new SPIRVDecorate(DecoKind, Target));
- break;
- }
- case DecorationBufferLocationINTEL:
- case DecorationMMHostInterfaceReadWriteModeINTEL:
- case DecorationMMHostInterfaceAddressWidthINTEL:
- case DecorationMMHostInterfaceDataWidthINTEL:
- case DecorationMMHostInterfaceLatencyINTEL:
- case DecorationMMHostInterfaceMaxBurstINTEL:
- case DecorationMMHostInterfaceWaitRequestINTEL: {
- ErrLog.checkError(NumOperands == 2, SPIRVEC_InvalidLlvmModule,
- "MMHost Kernel Argument Annotation requires exactly 2 "
- "extra operands");
- auto *DecoValEO1 =
- mdconst::dyn_extract<ConstantInt>(DecoMD->getOperand(1));
- Target->addDecorate(
- new SPIRVDecorate(DecoKind, Target, DecoValEO1->getZExtValue()));
- break;
- }
case DecorationStallEnableINTEL: {
Target->addDecorate(new SPIRVDecorateStallEnableINTEL(Target));
break;
diff --git a/lib/SPIRV/libSPIRV/SPIRVDecorate.h b/lib/SPIRV/libSPIRV/SPIRVDecorate.h
index 3f50f615..f286f6fe 100644
--- a/lib/SPIRV/libSPIRV/SPIRVDecorate.h
+++ b/lib/SPIRV/libSPIRV/SPIRVDecorate.h
@@ -178,16 +178,6 @@ public:
case internal::DecorationInitModeINTEL:
case internal::DecorationImplementInCSRINTEL:
return ExtensionID::SPV_INTEL_global_variable_decorations;
- case DecorationConduitKernelArgumentINTEL:
- case DecorationRegisterMapKernelArgumentINTEL:
- case DecorationStableKernelArgumentINTEL:
- case DecorationMMHostInterfaceReadWriteModeINTEL:
- case DecorationMMHostInterfaceAddressWidthINTEL:
- case DecorationMMHostInterfaceDataWidthINTEL:
- case DecorationMMHostInterfaceLatencyINTEL:
- case DecorationMMHostInterfaceMaxBurstINTEL:
- case DecorationMMHostInterfaceWaitRequestINTEL:
- return ExtensionID::SPV_INTEL_fpga_argument_interfaces;
default:
return {};
}
diff --git a/lib/SPIRV/libSPIRV/SPIRVEnum.h b/lib/SPIRV/libSPIRV/SPIRVEnum.h
index 3b6bd153..d41b8a86 100644
--- a/lib/SPIRV/libSPIRV/SPIRVEnum.h
+++ b/lib/SPIRV/libSPIRV/SPIRVEnum.h
@@ -451,24 +451,6 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::init() {
{internal::CapabilityGlobalVariableDecorationsINTEL});
ADD_VEC_INIT(internal::DecorationArgumentAttributeINTEL,
{CapabilityFunctionPointersINTEL});
- ADD_VEC_INIT(DecorationConduitKernelArgumentINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationRegisterMapKernelArgumentINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceAddressWidthINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceDataWidthINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceLatencyINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceReadWriteModeINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceMaxBurstINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationMMHostInterfaceWaitRequestINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
- ADD_VEC_INIT(DecorationStableKernelArgumentINTEL,
- {CapabilityFPGAArgumentInterfacesINTEL});
}
template <> inline void SPIRVMap<BuiltIn, SPIRVCapVec>::init() {
diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
index 2a34e0b6..f09a8922 100644
--- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
+++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
@@ -183,19 +183,6 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
add(DecorationInitiationIntervalINTEL, "InitiationIntervalINTEL");
add(DecorationMaxConcurrencyINTEL, "MaxConcurrencyINTEL");
add(DecorationPipelineEnableINTEL, "PipelineEnableINTEL");
- add(DecorationConduitKernelArgumentINTEL, "ConduitKernelArgumentINTEL");
- add(DecorationRegisterMapKernelArgumentINTEL,
- "RegisterMapKernelArgumentINTEL");
- add(DecorationMMHostInterfaceAddressWidthINTEL,
- "MMHostInterfaceAddressWidthINTEL");
- add(DecorationMMHostInterfaceDataWidthINTEL, "MMHostInterfaceDataWidthINTEL");
- add(DecorationMMHostInterfaceLatencyINTEL, "MMHostInterfaceLatencyINTEL");
- add(DecorationMMHostInterfaceReadWriteModeINTEL,
- "MMHostInterfaceReadWriteModeINTEL");
- add(DecorationMMHostInterfaceMaxBurstINTEL, "MMHostInterfaceMaxBurstINTEL");
- add(DecorationMMHostInterfaceWaitRequestINTEL,
- "MMHostInterfaceWaitRequestINTEL");
- add(DecorationStableKernelArgumentINTEL, "StableKernelArgumentINTEL");
// From spirv_internal.hpp
add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
@@ -615,7 +602,6 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
"FPGAInvocationPipeliningAttributesINTEL");
add(CapabilityRuntimeAlignedAttributeINTEL, "RuntimeAlignedAttributeINTEL");
add(CapabilityMax, "Max");
- add(CapabilityFPGAArgumentInterfacesINTEL, "FPGAArgumentInterfacesINTEL");
// From spirv_internal.hpp
add(internal::CapabilityFastCompositeINTEL, "FastCompositeINTEL");
diff --git a/spirv-headers-tag.conf b/spirv-headers-tag.conf
index 49e09ea4..be6002ca 100644
--- a/spirv-headers-tag.conf
+++ b/spirv-headers-tag.conf
@@ -1 +1 @@
-36c7694279dfb3ea7e6e086e368bb8bee076792a
+70ff9d939cd7fd0c758756ac57ab0c7c6d6c64d6
diff --git a/test/extensions/INTEL/SPV_INTEL_fpga_argument_interfaces/sycl-kernel-arg-annotation.ll b/test/extensions/INTEL/SPV_INTEL_fpga_argument_interfaces/sycl-kernel-arg-annotation.ll
deleted file mode 100644
index a8751a53..00000000
--- a/test/extensions/INTEL/SPV_INTEL_fpga_argument_interfaces/sycl-kernel-arg-annotation.ll
+++ /dev/null
@@ -1,69 +0,0 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: llvm-spirv %t.bc -spirv-ext=-all,+SPV_INTEL_fpga_argument_interfaces,+SPV_INTEL_fpga_buffer_location -o %t.spv
-; RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
-; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
-; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
-
-target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
-target triple = "spir64-unknown-unknown"
-
-$_ZTS4MyIP = comdat any
-
-; Function Attrs: convergent mustprogress norecurse
-define weak_odr dso_local spir_kernel void @_ZTS4MyIP(i32 addrspace(4)* noundef %_arg_p) #0 comdat !kernel_arg_buffer_location !1587 !spirv.ParameterDecorations !1588
-; CHECK-LLVM-DAG: !spirv.ParameterDecorations ![[PARMDECOR:[0-9]+]]
-{
-entry:
- ret void
-}
-
-!1587 = !{i32 -1}
-!1588 = !{!1589}
-!1589 = !{!1590, !1591, !1592, !1593, !1594, !1595, !1596, !1597, !1598, !1599, !1600, !1601}
-!1590 = !{i32 44, i32 4}
-!1591 = !{i32 6177, i32 32}
-!1592 = !{i32 5921, i32 10}
-!1593 = !{i32 6175, i32 1}
-!1594 = !{i32 6178, i32 64}
-!1595 = !{i32 6179, i32 1}
-!1596 = !{i32 6181, i32 3}
-!1597 = !{i32 6180, i32 2}
-!1598 = !{i32 6176, i32 1}
-!1599 = !{i32 6183, i32 1}
-!1600 = !{i32 19, i32 1}
-!1601 = !{i32 6182, i32 5}
-
-; CHECK-LLVM-DAG: ![[PARMDECOR]] = !{![[ARG:[0-9]+]]}
-; CHECK-LLVM-DAG: ![[ARG]] = !{![[ALIGN:[0-9]+]], ![[AWIDTH:[0-9]+]], ![[BL:[0-9]+]], ![[CONDUIT:[0-9]+]], ![[DWIDTH:[0-9]+]], ![[LATENCY:[0-9]+]], ![[MAXBURST:[0-9]+]], ![[RWMODE:[0-9]+]], ![[REGMAP:[0-9]+]], ![[STABLE:[0-9]+]], ![[STRICT:[0-9]+]], ![[WAITREQ:[0-9]+]]}
-
-; CHECK: ![[ALIGN]] = !{i32 44, i32 4}
-; CHECK: ![[AWIDTH]] = !{i32 6177, i32 32}
-; CHECK: ![[BL]] = !{i32 5921, i32 10}
-; CHECK: ![[CONDUIT]] = !{i32 6175, i32 1}
-; CHECK: ![[DWIDTH]] = !{i32 6178, i32 64}
-; CHECK: ![[LATENCY]] = !{i32 6179, i32 1}
-; CHECK: ![[MAXBURST]] = !{i32 6181, i32 3}
-; CHECK: ![[RWMODE]] = !{i32 6180, i32 2}
-; CHECK: ![[REGMAP]] = !{i32 6176, i32 1}
-; CHECK: ![[STABLE]] = !{i32 6183, i32 1}
-; CHECK: ![[STRICT]] = !{i32 19, i32 1}
-; CHECK: ![[WAITREQ]] = !{i32 6182, i32 5}
-
-; CHECK-SPIRV: Capability FPGABufferLocationINTEL
-; CHECK-SPIRV: Capability FPGAArgumentInterfacesINTEL
-; CHECK-SPIRV: Extension "SPV_INTEL_fpga_argument_interfaces"
-; CHECK-SPIRV: Extension "SPV_INTEL_fpga_buffer_location"
-; CHECK-SPIRV-DAG: Name [[IDS:[0-9]+]] "_arg_p"
-; CHECK-SPIRV-DAG: Name [[ID:[0-9]+]] "_arg_p"
-; CHECK-SPIRV: Decorate [[ID]] Alignment 4
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceAddressWidthINTEL 32
-; CHECK-SPIRV: Decorate [[ID]] BufferLocationINTEL 10
-; CHECK-SPIRV: Decorate [[ID]] ConduitKernelArgumentINTEL
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceDataWidthINTEL 64
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceLatencyINTEL 1
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceMaxBurstINTEL 3
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceReadWriteModeINTEL 2
-; CHECK-SPIRV: Decorate [[ID]] RegisterMapKernelArgumentINTEL
-; CHECK-SPIRV: Decorate [[ID]] StableKernelArgumentINTEL
-; CHECK-SPIRV: Decorate [[ID]] Restrict
-; CHECK-SPIRV: Decorate [[ID]] MMHostInterfaceWaitRequestINTEL 5
--
2.40.0

3
SPIRV-LLVM-Translator-15.0.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88
size 1515145

3
SPIRV-LLVM-Translator-16.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:305fac5bb8efdad9054f0d27b5b765aca8b3349a500e2ba0c927763e42badc2b
size 1542060

13
spirv-llvm-translator.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Mar 22 22:40:42 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Update to version 16.0.0.
* Compatibility with LLVM 16.
- Add Revert-Add-support-for-LLVM_LINK_LLVM_DYLIB.patch: while
gh#KhronosGroup/SPIRV-LLVM-Translator#1543 claims to add support
for LLVM_LINK_LLVM_DYLIB, it actually seems to break it.
- Add Revert-added-translator-support-for-SPIRV_INTEL.patch: while
gh#KhronosGroup/SPIRV-LLVM-Translator#1632 has made it into this
release, there is no release of spirv-headers containing the
pendant gh#KhronosGroup/SPIRV-Headers#291 yet.
-------------------------------------------------------------------
Sun Jan 15 13:28:45 UTC 2023 - Martin Hauke <mardnh@gmx.de>

12
spirv-llvm-translator.spec
View File

@ -1,6 +1,7 @@
#
# spec file for package spirv-llvm-translator
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2023, Martin Hauke <mardnh@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@ -15,18 +16,21 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sover 15
%define sover 16
Name: spirv-llvm-translator
Version: 15.0.0
Version: 16.0.0
Release: 0
Summary: LLVM/SPIR-V Bi-Directional Translator library
License: BSD-3-Clause
Group: System/Libraries
URL: https://github.com/KhronosGroup/SPIRV-LLVM-Translator
Source: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v%{version}.tar.gz#/SPIRV-LLVM-Translator-%{version}.tar.gz
Patch1: Revert-Add-support-for-LLVM_LINK_LLVM_DYLIB.patch
Patch2: Revert-added-translator-support-for-SPIRV_INTEL.patch
BuildRequires: cmake >= 3.3
BuildRequires: gcc-c++
BuildRequires: llvm-devel >= 15.0
BuildRequires: llvm%{sover}-devel
BuildRequires: pkgconfig
BuildRequires: spirv-headers
BuildRequires: pkgconfig(libxml-2.0)
@ -58,6 +62,8 @@ the LLVM/SPIR-V Bi-Directional Translator library.
%prep
%setup -q -n SPIRV-LLVM-Translator-%{version}
%patch1 -p1
%patch2 -p1
%build
%cmake \