rpms/Mesa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt by autoport with build requirements: libclang-devel>=17.0.3-1mamba [release 23.2.1-2mamba;Wed Oct 25 2023]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-05 17:47:59 +01:00
parent 5586a3f240
commit 1b3ee2386e
2 changed files with 119 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Mesa-23.2.1-llvm-17.0.3.patch Normal file
View File

@ -0,0 +1,108 @@
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
index 7a50fea332395d3d1f350b0c7a733b29817a616d..43d26fe1abbce7411ee2a224e0abf7f560101e25 100644
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
@@ -27,13 +27,17 @@
#include <llvm/IR/DiagnosticPrinter.h>
#include <llvm/IR/DiagnosticInfo.h>
#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
#include <llvm/Support/raw_ostream.h>
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
+#include <llvm/Transforms/IPO/Internalize.h>
#include <llvm-c/Target.h>
#ifdef HAVE_CLOVER_SPIRV
#include <LLVMSPIRVLib/LLVMSPIRVLib.h>
#endif
+#include <llvm-c/TargetMachine.h>
+#include <llvm-c/Transforms/PassBuilder.h>
+#include <llvm/Support/CBindingWrapping.h>
#include <clang/CodeGen/CodeGenAction.h>
#include <clang/Lex/PreprocessorOptions.h>
#include <clang/Frontend/TextDiagnosticBuffer.h>
@@ -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<std::string> 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<O0>";
+ level = LLVMCodeGenLevelNone;
+ break;
+ case 1:
+ opt_str = "default<O1>";
+ level = LLVMCodeGenLevelLess;
+ break;
+ case 2:
+ opt_str = "default<O2>";
+ level = LLVMCodeGenLevelDefault;
+ break;
+ case 3:
+ opt_str = "default<O3>";
+ 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<Module>
@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &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() + "-" +

14
Mesa.spec
View File

@ -1,14 +1,14 @@
Name: Mesa Name: Mesa
Epoch: 1 Epoch: 1
Version: 23.2.1 Version: 23.2.1
Release: 1mamba Release: 2mamba
Summary: A 3-D graphics library with an API which is very similar to that of OpenGL Summary: A 3-D graphics library with an API which is very similar to that of OpenGL
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://mesa3d.org/ URL: https://mesa3d.org/
Source: ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz Source: https://archive.mesa3d.org/mesa-%{version}.tar.xz
Patch0: Mesa-7.10.2-driproto-2.4.patch Patch0: Mesa-7.10.2-driproto-2.4.patch
Patch1: Mesa-7.10.2-fix_nouveau_dri_includes.patch Patch1: Mesa-7.10.2-fix_nouveau_dri_includes.patch
Patch2: Mesa-8.0.4-llvm-3.1-fixes-1.patch Patch2: Mesa-8.0.4-llvm-3.1-fixes-1.patch
@ -18,6 +18,7 @@ Patch5: Mesa-21.2.5-llvm-13-patch2.patch
Patch6: Mesa-21.2.5-aarch64-rip-out-VC4-forced-NEON.patch Patch6: Mesa-21.2.5-aarch64-rip-out-VC4-forced-NEON.patch
Patch7: Mesa-22.2.4-revert-glx-fix-drawable-refounting-for-naked-windows.patch Patch7: Mesa-22.2.4-revert-glx-fix-drawable-refounting-for-naked-windows.patch
Patch8: Mesa-23.0.3-rustc-1.69.0.patch Patch8: Mesa-23.0.3-rustc-1.69.0.patch
Patch9: Mesa-23.2.1-llvm-17.0.3.patch
License: MIT License: MIT
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -44,7 +45,7 @@ BuildRequires: libxshmfence-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: libzstd-devel BuildRequires: libzstd-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libclang-devel >= 0:16.0.4-1mamba BuildRequires: libclang-devel >= 17.0.3-1mamba
BuildRequires: libllvm-devel >= 14.0.3 BuildRequires: libllvm-devel >= 14.0.3
BuildRequires: xproto-devel >= 7.1 BuildRequires: xproto-devel >= 7.1
BuildRequires: dri2proto-devel BuildRequires: dri2proto-devel
@ -135,13 +136,17 @@ Common files and tools for the Mesa GL libraries.
%prep %prep
%setup -q -n mesa-%{version} %setup -q -n mesa-%{version}
#-D -T
#:<< _EOF
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
#%patch4 -p1 #%patch4 -p1
#%patch5 -p1 #%patch5 -p1
#%patch7 -p1 #%patch7 -p1
#%patch 8 -p1 -b .rustc-1.69.0 #%patch 8 -p1 -b .rustc-1.69.0
%patch 9 -p1 -b .llvm-17.0.3
%build %build
#:<< _EOF
#%ifnarch arm #%ifnarch arm
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
@ -304,6 +309,9 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%{_libdir}/pkgconfig/xatracker.pc %{_libdir}/pkgconfig/xatracker.pc
%changelog %changelog
* Wed Oct 25 2023 Automatic Build System <autodist@mambasoft.it> 23.2.1-2mamba
- rebuilt by autoport with build requirements: libclang-devel>=17.0.3-1mamba
* Sat Oct 07 2023 Automatic Build System <autodist@mambasoft.it> 23.2.1-1mamba * Sat Oct 07 2023 Automatic Build System <autodist@mambasoft.it> 23.2.1-1mamba
- automatic version update by autodist - automatic version update by autodist