SpirvShader: Add relational ops for integers

Bug: b/127282157
Change-Id: Icaec924ef011b42069d157bec2d76ae5df3eea46
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26048
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Pipeline/SpirvShader.cpp

@@ -231,6 +231,16 @@ namespace sw
 			case spv::OpFSub:
 			case spv::OpFDiv:
 			case spv::OpUMod:
+			case spv::OpIEqual:
+			case spv::OpINotEqual:
+			case spv::OpUGreaterThan:
+			case spv::OpSGreaterThan:
+			case spv::OpUGreaterThanEqual:
+			case spv::OpSGreaterThanEqual:
+			case spv::OpULessThan:
+			case spv::OpSLessThan:
+			case spv::OpULessThanEqual:
+			case spv::OpSLessThanEqual:
 			case spv::OpShiftRightLogical:
 			case spv::OpShiftRightArithmetic:
 			case spv::OpShiftLeftLogical:
@@ -918,6 +928,16 @@ namespace sw
 			case spv::OpFSub:
 			case spv::OpFDiv:
 			case spv::OpUMod:
+			case spv::OpIEqual:
+			case spv::OpINotEqual:
+			case spv::OpUGreaterThan:
+			case spv::OpSGreaterThan:
+			case spv::OpUGreaterThanEqual:
+			case spv::OpSGreaterThanEqual:
+			case spv::OpULessThan:
+			case spv::OpSLessThan:
+			case spv::OpULessThanEqual:
+			case spv::OpSLessThanEqual:
 			case spv::OpShiftRightLogical:
 			case spv::OpShiftRightArithmetic:
 			case spv::OpShiftLeftLogical:
@@ -1269,6 +1289,36 @@ namespace sw
 			case spv::OpUMod:
 				dst.emplace(i, As<SIMD::Float>(As<SIMD::UInt>(lhs) % As<SIMD::UInt>(rhs)));
 				break;
+			case spv::OpIEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpEQ(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
+			case spv::OpINotEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpNEQ(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
+			case spv::OpUGreaterThan:
+				dst.emplace(i, As<SIMD::Float>(CmpGT(As<SIMD::UInt>(lhs), As<SIMD::UInt>(rhs))));
+				break;
+			case spv::OpSGreaterThan:
+				dst.emplace(i, As<SIMD::Float>(CmpGT(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
+			case spv::OpUGreaterThanEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpGE(As<SIMD::UInt>(lhs), As<SIMD::UInt>(rhs))));
+				break;
+			case spv::OpSGreaterThanEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpGE(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
+			case spv::OpULessThan:
+				dst.emplace(i, As<SIMD::Float>(CmpLT(As<SIMD::UInt>(lhs), As<SIMD::UInt>(rhs))));
+				break;
+			case spv::OpSLessThan:
+				dst.emplace(i, As<SIMD::Float>(CmpLT(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
+			case spv::OpULessThanEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpLE(As<SIMD::UInt>(lhs), As<SIMD::UInt>(rhs))));
+				break;
+			case spv::OpSLessThanEqual:
+				dst.emplace(i, As<SIMD::Float>(CmpLE(As<SIMD::Int>(lhs), As<SIMD::Int>(rhs))));
+				break;
 			case spv::OpFAdd:
 				dst.emplace(i, lhs + rhs);
 				break;

src/Reactor/Reactor.hpp

@@ -1847,6 +1847,8 @@ namespace rr
 	RValue<Int4> CmpNEQ(RValue<Int4> x, RValue<Int4> y);
 	RValue<Int4> CmpNLT(RValue<Int4> x, RValue<Int4> y);
 	RValue<Int4> CmpNLE(RValue<Int4> x, RValue<Int4> y);
+	inline RValue<Int4> CmpGT(RValue<Int4> x, RValue<Int4> y) { return CmpNLE(x, y); }
+	inline RValue<Int4> CmpGE(RValue<Int4> x, RValue<Int4> y) { return CmpNLT(x, y); }
 	RValue<Int4> Max(RValue<Int4> x, RValue<Int4> y);
 	RValue<Int4> Min(RValue<Int4> x, RValue<Int4> y);
 	RValue<Int4> RoundInt(RValue<Float4> cast);
@@ -1929,6 +1931,8 @@ namespace rr
 	RValue<UInt4> CmpNEQ(RValue<UInt4> x, RValue<UInt4> y);
 	RValue<UInt4> CmpNLT(RValue<UInt4> x, RValue<UInt4> y);
 	RValue<UInt4> CmpNLE(RValue<UInt4> x, RValue<UInt4> y);
+	inline RValue<UInt4> CmpGT(RValue<UInt4> x, RValue<UInt4> y) { return CmpNLE(x, y); }
+	inline RValue<UInt4> CmpGE(RValue<UInt4> x, RValue<UInt4> y) { return CmpNLT(x, y); }
 	RValue<UInt4> Max(RValue<UInt4> x, RValue<UInt4> y);
 	RValue<UInt4> Min(RValue<UInt4> x, RValue<UInt4> y);
 	RValue<UInt4> MulHigh(RValue<UInt4> x, RValue<UInt4> y);