From 79acec92531df8b2818d3c5b9887c8a8733e729eee20e7e9e1c7ba71fc43c2dc Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 20 Oct 2022 09:24:42 +0000 Subject: [PATCH 1/2] - update to 22.2.2 * This is the second bug fix release, back on the regular schedule. There's a lot here: nir, panfrost, gallium video, freedreno, nouveau, turnip, r300, gallium core, r600, virgl, core vulkan, anv, clover, d3d12, utils, radv, and plenty of zink. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1149 --- Mesa.changes | 10 ++++++++++ Mesa.spec | 4 ++-- mesa-22.2.1.tar.xz | 3 --- mesa-22.2.1.tar.xz.sig | Bin 119 -> 0 bytes mesa-22.2.2.tar.xz | 3 +++ mesa-22.2.2.tar.xz.sig | Bin 0 -> 119 bytes 6 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 mesa-22.2.1.tar.xz delete mode 100644 mesa-22.2.1.tar.xz.sig create mode 100644 mesa-22.2.2.tar.xz create mode 100644 mesa-22.2.2.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index fd2cc89..ca4b6dd 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 20 08:46:59 UTC 2022 - Stefan Dirsch + +- update to 22.2.2 + * This is the second bug fix release, back on the regular + schedule. There's a lot here: nir, panfrost, gallium video, + freedreno, nouveau, turnip, r300, gallium core, r600, virgl, + core vulkan, anv, clover, d3d12, utils, radv, and plenty of + zink. + ------------------------------------------------------------------- Tue Oct 11 19:28:31 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index d00d33c..e80818a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 22.2.1 +%define _version 22.2.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -119,7 +119,7 @@ %endif Name: Mesa%{psuffix} -Version: 22.2.1 +Version: 22.2.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-22.2.1.tar.xz b/mesa-22.2.1.tar.xz deleted file mode 100644 index 6ca98c8..0000000 --- a/mesa-22.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c -size 16408240 diff --git a/mesa-22.2.1.tar.xz.sig b/mesa-22.2.1.tar.xz.sig deleted file mode 100644 index 9e8f79cb4e89700eae0383b478042a128e877ab930b601e1f35f01a9d844c08d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rliiGgs4>xdsY7{?TCfxs04BmQi2wiq diff --git a/mesa-22.2.2.tar.xz b/mesa-22.2.2.tar.xz new file mode 100644 index 0000000..a999e9f --- /dev/null +++ b/mesa-22.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9 +size 16424508 diff --git a/mesa-22.2.2.tar.xz.sig b/mesa-22.2.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..acea51297d23d36233c0cdb683bfdc30700f2bca815cf20baf75286d183f59eb GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rlpLVf$iT%Z02A@&Vq`dS zNp0z)id8Jit%oygI{Eb7xjMeBo^H9LZu2vNZQaK84F7%kPH)(+?5m&XdDGE;!zI Date: Fri, 21 Oct 2022 12:07:45 +0000 Subject: [PATCH 2/2] Accepting request 1030363 from home:favogt:boo1204267 - Add patch to fix LLVM optimization to avoid failure on armv7 (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19217, boo#1204267): * u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch OBS-URL: https://build.opensuse.org/request/show/1030363 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1150 --- Mesa.changes | 8 ++ Mesa.spec | 2 + ...-optimization-with-the-new-pass-mana.patch | 92 +++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch diff --git a/Mesa.changes b/Mesa.changes index ca4b6dd..e611f47 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 21 09:41:37 UTC 2022 - Fabian Vogt + +- Add patch to fix LLVM optimization to avoid failure on armv7 + (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19217, + boo#1204267): + * u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch + ------------------------------------------------------------------- Thu Oct 20 08:46:59 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index e80818a..5d80122 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -139,6 +139,7 @@ Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch200: u_fix-build-on-ppc64le.patch +Patch201: u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch Patch300: n_buildfix-21.3.0.patch Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch Patch500: n_stop-iris-flicker.patch @@ -760,6 +761,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch58 -p1 %patch100 -p1 %patch200 -p1 +%patch201 -p1 %patch300 -p1 %ifarch %{ix86} %patch400 -p1 diff --git a/u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch b/u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch new file mode 100644 index 0000000..499e9ea --- /dev/null +++ b/u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch @@ -0,0 +1,92 @@ +From 7d6df34deeed5a42163f9b548945e4d785ba48cf Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Fri, 21 Oct 2022 11:20:31 +0200 +Subject: [PATCH] gallivm: Fix LLVM optimization with the new pass manager + +The previous list of passes contained several errors: "constprop" does not +exist anymore and a trailing ',' is not allowed. This made LLVMRunPasses +fail, but the error is silently ignored. Thus none of the listed passes +ran at all. + +https://reviews.llvm.org/D85159 suggests "InstSimplify really should be +used anywhere ConstProp is being used" so replace constprop with +instsimplify and remove the trailing comma. + +By enabling pass logging with +LLVMPassBuilderOptionsSetDebugLogging(opts, true), +the difference is visible. Before: + +Running pass: AlwaysInlinerPass on [module] +Running analysis: InnerAnalysisManagerProxy on [module] +Running analysis: ProfileSummaryAnalysis on [module] +Running pass: CoroConditionalWrapper on [module] +Running pass: AnnotationRemarksPass on fs_variant_partial (1162 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_partial +Running pass: AnnotationRemarksPass on fs_variant_whole (1110 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_whole + +After: + +Running pass: AlwaysInlinerPass on [module] +Running analysis: InnerAnalysisManagerProxy on [module] +Running analysis: ProfileSummaryAnalysis on [module] +Running pass: CoroConditionalWrapper on [module] +Running pass: AnnotationRemarksPass on fs_variant_partial (1162 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_partial +Running pass: AnnotationRemarksPass on fs_variant_whole (1110 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_whole +Running analysis: InnerAnalysisManagerProxy on [module] +Running pass: SROAPass on fs_variant_partial (1162 instructions) +Running analysis: DominatorTreeAnalysis on fs_variant_partial +Running analysis: AssumptionAnalysis on fs_variant_partial +Running analysis: TargetIRAnalysis on fs_variant_partial +Running pass: EarlyCSEPass on fs_variant_partial (1111 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_partial +Running pass: SimplifyCFGPass on fs_variant_partial (961 instructions) +Running pass: ReassociatePass on fs_variant_partial (961 instructions) +Running pass: PromotePass on fs_variant_partial (897 instructions) +Running pass: InstCombinePass on fs_variant_partial (897 instructions) +Running analysis: OptimizationRemarkEmitterAnalysis on fs_variant_partial +Running analysis: AAManager on fs_variant_partial +Running analysis: BasicAA on fs_variant_partial +Running analysis: ScopedNoAliasAA on fs_variant_partial +Running analysis: TypeBasedAA on fs_variant_partial +Running analysis: OuterAnalysisManagerProxy on fs_variant_partial +Running pass: SROAPass on fs_variant_whole (1110 instructions) +Running analysis: DominatorTreeAnalysis on fs_variant_whole +Running analysis: AssumptionAnalysis on fs_variant_whole +Running analysis: TargetIRAnalysis on fs_variant_whole +Running pass: EarlyCSEPass on fs_variant_whole (1059 instructions) +Running analysis: TargetLibraryAnalysis on fs_variant_whole +Running pass: SimplifyCFGPass on fs_variant_whole (912 instructions) +Running pass: ReassociatePass on fs_variant_whole (912 instructions) +Running pass: PromotePass on fs_variant_whole (844 instructions) +Running pass: InstCombinePass on fs_variant_whole (844 instructions) +Running analysis: OptimizationRemarkEmitterAnalysis on fs_variant_whole +Running analysis: AAManager on fs_variant_whole +Running analysis: BasicAA on fs_variant_whole +Running analysis: ScopedNoAliasAA on fs_variant_whole +Running analysis: TypeBasedAA on fs_variant_whole +Running analysis: OuterAnalysisManagerProxy on fs_variant_whole + +Fixes: 2037c34f245 ("gallivm: move to new pass manager to handle coroutines change.") +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index f77aac75b76..cc410cc1928 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -601,7 +601,7 @@ gallivm_compile_module(struct gallivm_state *gallivm) + LLVMRunPasses(gallivm->module, passes, LLVMGetExecutionEngineTargetMachine(gallivm->engine), opts); + + if (!(gallivm_perf & GALLIVM_PERF_NO_OPT)) +- strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,constprop,instcombine,"); ++ strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine"); + else + strcpy(passes, "mem2reg"); + +-- +2.38.0 +