From fdf78b7dd86784ed11033f546127a653a37cd054 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 May 2024 13:25:40 +0000 Subject: [PATCH] import UBI mesa-23.1.4-2.el8 --- ...ver-llvm-move-to-modern-pass-manager.patch | 127 ++++++++++++++++++ ...clude-old-Transform-includes-when-ne.patch | 41 ++++++ SPECS/mesa.spec | 9 +- 3 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch create mode 100644 SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch diff --git a/SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch b/SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch new file mode 100644 index 0000000..cb6971e --- /dev/null +++ b/SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch @@ -0,0 +1,127 @@ +From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 25 Aug 2023 12:43:44 +1000 +Subject: [PATCH] clover/llvm: move to modern pass manager. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This seems like it should work, but I haven't tested it yet. + +Tested-by: Dieter Nützel +Part-of: +--- + .../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++---- + 1 file changed, 51 insertions(+), 13 deletions(-) + +diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp +index 7a50fea3323..43d26fe1abb 100644 +--- a/src/gallium/frontends/clover/llvm/invocation.cpp ++++ b/src/gallium/frontends/clover/llvm/invocation.cpp +@@ -27,13 +27,17 @@ + #include + #include + #include ++#include + #include +-#include ++#include + #include + #ifdef HAVE_CLOVER_SPIRV + #include + #endif + ++#include ++#include ++#include + #include + #include + #include +@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source, + + namespace { + void +- optimize(Module &mod, unsigned optimization_level, ++ optimize(Module &mod, ++ const std::string& ir_target, ++ unsigned optimization_level, + bool internalize_symbols) { +- ::llvm::legacy::PassManager pm; +- + // By default, the function internalizer pass will look for a function + // called "main" and then mark all other functions as internal. Marking + // functions as internal enables the optimizer to perform optimizations +@@ -458,19 +462,53 @@ namespace { + if (internalize_symbols) { + std::vector names = + map(std::mem_fn(&Function::getName), get_kernels(mod)); +- pm.add(::llvm::createInternalizePass( ++ internalizeModule(mod, + [=](const ::llvm::GlobalValue &gv) { + return std::find(names.begin(), names.end(), + gv.getName()) != names.end(); +- })); ++ }); + } + +- ::llvm::PassManagerBuilder pmb; +- pmb.OptLevel = optimization_level; +- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl( +- ::llvm::Triple(mod.getTargetTriple())); +- pmb.populateModulePassManager(pm); +- pm.run(mod); ++ ++ const char *opt_str = NULL; ++ LLVMCodeGenOptLevel level; ++ switch (optimization_level) { ++ case 0: ++ default: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelNone; ++ break; ++ case 1: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelLess; ++ break; ++ case 2: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelDefault; ++ break; ++ case 3: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelAggressive; ++ break; ++ } ++ ++ const target &target = ir_target; ++ LLVMTargetRef targ; ++ char *err_message; ++ ++ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message)) ++ return; ++ LLVMTargetMachineRef tm = ++ LLVMCreateTargetMachine(targ, target.triple.c_str(), ++ target.cpu.c_str(), "", level, ++ LLVMRelocDefault, LLVMCodeModelDefault); ++ ++ if (!tm) ++ return; ++ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions(); ++ LLVMRunPasses(wrap(&mod), opt_str, tm, opts); ++ ++ LLVMDisposeTargetMachine(tm); + } + + std::unique_ptr +@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector &binaries, + auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log); + auto mod = link(*ctx, *c, binaries, r_log); + +- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library); ++ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library); + + static std::atomic_uint seq(0); + const std::string id = "." + mod->getModuleIdentifier() + "-" + +-- +2.42.0 + diff --git a/SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch b/SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch new file mode 100644 index 0000000..064d5eb --- /dev/null +++ b/SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch @@ -0,0 +1,41 @@ +From 9ba416cdc67073cdda9a73fe9d37304b82bdd526 Mon Sep 17 00:00:00 2001 +From: Pierre-Eric Pelloux-Prayer +Date: Fri, 12 May 2023 09:58:26 +0200 +Subject: [PATCH] llvmpipe: only include old Transform includes when needed + +This fixes building with recent LLVM where these 2 .h files +were removed. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671 +Acked-By: Mike Blumenkrantz +Part-of: +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index 24d082398e9..9e0d6a5f643 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -42,14 +42,14 @@ + + #include + #include +-#include +-#if LLVM_VERSION_MAJOR >= 7 +-#include +-#endif + #include + #if GALLIVM_USE_NEW_PASS == 1 + #include + #elif GALLIVM_HAVE_CORO == 1 ++#include ++#if LLVM_VERSION_MAJOR >= 7 ++#include ++#endif + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) + #include + #endif +-- +2.42.0 + diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec index 1f3a078..6896216 100644 --- a/SPECS/mesa.spec +++ b/SPECS/mesa.spec @@ -38,7 +38,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 23.1.4 -Release: 1%{?rctag:.%{rctag}}%{?dist} +Release: 2%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -62,6 +62,10 @@ Patch1: fix-py-ver.patch Patch10: gnome-shell-glthread-disable.patch Patch12: radeonsi-turn-off-glthread.patch +# Required to build against LLVM 17 +Patch13: 0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch +Patch14: 0001-clover-llvm-move-to-modern-pass-manager.patch + BuildRequires: gcc BuildRequires: gcc-c++ @@ -583,6 +587,9 @@ done %endif %changelog +* Thu Nov 23 2023 José Expósito - 23.1.4-2 +- Rebuild against LLVM 17 + * Thu Jul 27 2023 Dave Airlie - 23.1.4-1 - Update to 23.1.4