commit 7ecf47355be363c8c5cc9debfca03bcec3f1d9a6
author Ben Clayton <bclayton@google.com> Tue Aug 13 11:45:10 2019 +0100
committer Ben Clayton <bclayton@google.com> Wed Aug 14 06:01:36 2019 +0000
tree ec022de9d3267460c59d5bb28658c801453f9753
parent ca2c5ef7f7ec17181376abe3b9229b2661da9f5d

SpirvShader: Refactor AllTrueMask() / AnyTrueMask()

Replace these with the more generic AndAll() and OrAll().
These can be used to clean up some existing code.

Bug: b/133510501
Tests: dEQP-VK.subgroups.*
Change-Id: I49f84f6c7088c1c810a0dfda5358a2cc4778f79d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35088
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

src/Pipeline/SpirvShader.cpp

diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index 0ffbc12..93344e8 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -45,18 +45,20 @@
 		return rr::SignMask(~ints) != 0;
 	}
 
-	rr::RValue<sw::SIMD::UInt> AllTrueMask(rr::RValue<sw::SIMD::UInt> const &mask)
+	template <typename T>
+	rr::RValue<T> AndAll(rr::RValue<T> const &mask)
 	{
-		sw::SIMD::UInt v1 = mask;              // [x]    [y]    [z]    [w]
-		sw::SIMD::UInt v2 = v1.xzxz & v1.ywyw; // [xy]   [zw]   [xy]   [zw]
-		return v2.xxxx & v2.yyyy;              // [xyzw] [xyzw] [xyzw] [xyzw]
+		T v1 = mask;              // [x]    [y]    [z]    [w]
+		T v2 = v1.xzxz & v1.ywyw; // [xy]   [zw]   [xy]   [zw]
+		return v2.xxxx & v2.yyyy; // [xyzw] [xyzw] [xyzw] [xyzw]
 	}
 
-	rr::RValue<sw::SIMD::UInt> AnyTrueMask(rr::RValue<sw::SIMD::UInt> const &mask)
+	template <typename T>
+	rr::RValue<T> OrAll(rr::RValue<T> const &mask)
 	{
-		sw::SIMD::UInt v1 = mask;              // [x]    [y]    [z]    [w]
-		sw::SIMD::UInt v2 = v1.xzxz | v1.ywyw; // [xy]   [zw]   [xy]   [zw]
-		return v2.xxxx | v2.yyyy;              // [xyzw] [xyzw] [xyzw] [xyzw]
+		T v1 = mask;              // [x]    [y]    [z]    [w]
+		T v2 = v1.xzxz | v1.ywyw; // [xy]   [zw]   [xy]   [zw]
+		return v2.xxxx | v2.yyyy; // [xyzw] [xyzw] [xyzw] [xyzw]
 	}
 
 	rr::RValue<sw::SIMD::Float> Sign(rr::RValue<sw::SIMD::Float> const &val)
@@ -6007,14 +6009,14 @@
 		case spv::OpGroupNonUniformAll:
 		{
 			GenericValue predicate(this, state, insn.word(4));
-			dst.move(0, AllTrueMask(predicate.UInt(0) | ~As<SIMD::UInt>(state->activeLaneMask())));
+			dst.move(0, AndAll(predicate.UInt(0) | ~As<SIMD::UInt>(state->activeLaneMask())));
 			break;
 		}
 
 		case spv::OpGroupNonUniformAny:
 		{
 			GenericValue predicate(this, state, insn.word(4));
-			dst.move(0, AnyTrueMask(predicate.UInt(0) & As<SIMD::UInt>(state->activeLaneMask())));
+			dst.move(0, OrAll(predicate.UInt(0) & As<SIMD::UInt>(state->activeLaneMask())));
 			break;
 		}
 
@@ -6032,7 +6034,7 @@
 				{
 					filled |= filled.yzwx & inactive; // Populate inactive 'holes' with a live value
 				}
-				res &= AllTrueMask(CmpEQ(filled.xyzw, filled.yzwx));
+				res &= AndAll(CmpEQ(filled.xyzw, filled.yzwx));
 			}
 			dst.move(0, res);
 			break;
@@ -6046,9 +6048,7 @@
 			auto mask = CmpEQ(id, SIMD::Int(0, 1, 2, 3));
 			for (auto i = 0u; i < type.sizeInComponents; i++)
 			{
-				auto oneVal = SIMD::Int(value.Int(i) & mask);
-				auto replVal = SIMD::Int(oneVal.xxzz | oneVal.yyww);
-				dst.move(i, replVal.xxyy | replVal.zzww);
+				dst.move(i, OrAll(value.Int(i) & mask));
 			}
 			break;
 		}
@@ -6066,9 +6066,7 @@
 			auto elect = active & ~(v0111 & (active.xxyz | active.xxxy | active.xxxx));
 			for (auto i = 0u; i < type.sizeInComponents; i++)
 			{
-				auto oneVal = SIMD::Int(value.Int(i) & elect);
-				auto replVal = SIMD::Int(oneVal.xxzz | oneVal.yyww);
-				dst.move(i, replVal.xxyy | replVal.zzww);
+				dst.move(i, OrAll(value.Int(i) & elect));
 			}
 			break;
 		}