diff options
| author | José Fonseca <[email protected]> | 2014-01-24 14:25:46 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2014-01-28 14:27:27 +0000 |
| commit | 2eddf91faf4abf0b3d7b81a0a486fd46d5acd1ea (patch) | |
| tree | 48548a0c22a5f73b21bd3aa88f47bd6b2a7d5f14 | |
| parent | 37f1903e007e30892ce39e6e2493c9e88dacf7cc (diff) | |
gallivm: Workaround http://llvm.org/PR18600
We have code generation paths that carry out swizzles of AoS vectors via
bitwise shifts, as these tend to generate more efficient code than
straightforward byte shuffles. But when the input is a constant the
additional bitwise arithmetic operations somehow don't really get
constant propagated properly, evenutally causing assertion failure in
InstCombine pass.
Therefore avoid the bug by using the trivial shuffles for constant
inputs.
Although the sample LLVM IR can cause a crash with any LLVM version,
this was only seen in practice with LLVM 3.2.
Reviewed-by: Matthew McClure <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_swizzle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c index 79116bcf391..9557e1c10de 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c @@ -180,7 +180,8 @@ lp_build_swizzle_scalar_aos(struct lp_build_context *bld, /* XXX: SSE3 has PSHUFB which should be better than bitmasks, but forcing * using shuffles here actually causes worst results. More investigation is * needed. */ - if (type.width >= 16) { + if (LLVMIsConstant(a) || + type.width >= 16) { /* * Shuffle. */ @@ -398,7 +399,8 @@ lp_build_swizzle_aos(struct lp_build_context *bld, } } - if (type.width >= 16) { + if (LLVMIsConstant(a) || + type.width >= 16) { /* * Shuffle. */ |