From 85877492fd44a4a7a488812c82d7eda1007011ed3e2c284d3f3c8211bcb8f9c2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 23 Aug 2017 09:26:16 +0000 Subject: [PATCH] - u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch updated; fixes three of the four regressions observed (PPC64, S390) [fdo#100613, comment#42] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=638 --- Mesa.changes | 7 + ...d_gather_elem_vec-BE-fix-for-3x16-lo.patch | 125 +++++++++++------- 2 files changed, 83 insertions(+), 49 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 3ea0e54..d4bba93 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 23 09:01:46 UTC 2017 - sndirsch@suse.com + +- u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch + updated; fixes three of the four regressions observed (PPC64, S390) + [fdo#100613, comment#42] + ------------------------------------------------------------------- Mon Aug 14 17:16:34 UTC 2017 - jberry@suse.com diff --git a/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch b/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch index f744e00..feb3c7c 100644 --- a/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch +++ b/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch @@ -1,49 +1,76 @@ -From 3f993cdf6db5cf344179fcb4fbf899f6ef9a6b2b Mon Sep 17 00:00:00 2001 -From: Ben Crocker -Date: Tue, 30 May 2017 12:34:23 -0400 -Subject: [PATCH] llvmpipe: lp_build_gather_elem_vec BE fix for 3x16 load - -Fix loading of a 3x16 vector as a single 48-bit load -on big-endian systems (PPC64, S390). - -Signed-off-by: Ben Crocker ---- - src/gallium/auxiliary/gallivm/lp_bld_gather.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.c b/src/gallium/auxiliary/gallivm/lp_bld_gather.c -index ccd0376..8e56e42 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_gather.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.c -@@ -234,13 +234,26 @@ lp_build_gather_elem_vec(struct gallivm_state *gallivm, - */ - res = LLVMBuildZExt(gallivm->builder, res, dst_elem_type, ""); - -- if (vector_justify) { - #ifdef PIPE_ARCH_BIG_ENDIAN -+ if (vector_justify) { - res = LLVMBuildShl(gallivm->builder, res, - LLVMConstInt(dst_elem_type, - dst_type.width - src_width, 0), ""); --#endif - } -+ if (src_width == 48) { -+ LLVMValueRef shuffles[4] = { -+ lp_build_const_int32(gallivm, 2), -+ lp_build_const_int32(gallivm, 1), -+ lp_build_const_int32(gallivm, 0), -+ lp_build_const_int32(gallivm, 3), -+ }; -+ struct lp_type type16 = {FALSE, FALSE, TRUE, FALSE, 16, 4}; -+ res = LLVMBuildBitCast(gallivm->builder, res, -+ lp_build_vec_type(gallivm, type16), ""); -+ res = LLVMBuildShuffleVector(gallivm->builder, res, res, LLVMConstVector(shuffles, 4), ""); -+ res = LLVMBuildBitCast(gallivm->builder, res, dst_elem_type, ""); -+ } -+#endif - } - } - return res; --- -2.7.4 - +From d3135d11bb77235324a21ccaa23be6df836c9870 Mon Sep 17 00:00:00 2001 +From: Ben Crocker +Date: Tue, 22 Aug 2017 13:43:29 -0400 +Subject: [PATCH] llvmpipe: lp_build_gather_elem_vec BE fix for 3x16 load + +Fix loading of a 3x16 vector as a single 48-bit load +on big-endian systems (PPC64, S390). + +Roland Scheidegger's commit e827d9175675aaa6cfc0b981e2a80685fb7b3a74 +plus Ray Strode's patch reduce pre-Roland Piglit failures from ~4000 to ~2000. +This patch fixes three of the four regressions observed by Ray: + +- draw-vertices +- draw-vertices-half-float +- draw-vertices-half-float_gles2 + +One regression remains: +- draw-vertices-2101010 + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100613 +Cc: "17.2" "17.1" + +Signed-off-by: Ben Crocker +--- + src/gallium/auxiliary/gallivm/lp_bld_gather.c | 30 +++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.c b/src/gallium/auxiliary/gallivm/lp_bld_gather.c +index ccd0376..7d11dcd 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_gather.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.c +@@ -234,13 +234,39 @@ lp_build_gather_elem_vec(struct gallivm_state *gallivm, + */ + res = LLVMBuildZExt(gallivm->builder, res, dst_elem_type, ""); + +- if (vector_justify) { + #ifdef PIPE_ARCH_BIG_ENDIAN ++ if (vector_justify) { + res = LLVMBuildShl(gallivm->builder, res, + LLVMConstInt(dst_elem_type, + dst_type.width - src_width, 0), ""); +-#endif + } ++ if (src_width == 48) { ++ /* Load 3x16 bit vector. ++ * The sequence of loads on big-endian hardware proceeds as follows. ++ * 16-bit fields are denoted by X, Y, Z, and 0. In memory, the sequence ++ * of three fields appears in the order X, Y, Z. ++ * ++ * Load 32-bit word: 0.0.X.Y ++ * Load 16-bit halfword: 0.0.0.Z ++ * Rotate left: 0.X.Y.0 ++ * Bitwise OR: 0.X.Y.Z ++ * ++ * The order in which we need the fields in the result is 0.Z.Y.X, ++ * the same as on little-endian; permute 16-bit fields accordingly ++ * within 64-bit register: ++ */ ++ LLVMValueRef shuffles[4] = { ++ lp_build_const_int32(gallivm, 2), ++ lp_build_const_int32(gallivm, 1), ++ lp_build_const_int32(gallivm, 0), ++ lp_build_const_int32(gallivm, 3), ++ }; ++ res = LLVMBuildBitCast(gallivm->builder, res, ++ lp_build_vec_type(gallivm, lp_type_uint_vec(16, 4*16)), ""); ++ res = LLVMBuildShuffleVector(gallivm->builder, res, res, LLVMConstVector(shuffles, 4), ""); ++ res = LLVMBuildBitCast(gallivm->builder, res, dst_elem_type, ""); ++ } ++#endif + } + } + return res; +-- +2.7.4 +