From 78f5eb90d7c5ecd92c4e8b7f71cf97b57d78dbfd Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 21 May 2021 02:20:08 -0400
Subject: [PATCH] glsl: INeg and IAdd negate tests
---
.../backend/glsl/emit_glsl_instructions.h | 72 +++++-----
.../backend/glsl/emit_glsl_integer.cpp | 129 ++++++++++--------
.../backend/glsl/reg_alloc.cpp | 3 +-
3 files changed, 108 insertions(+), 96 deletions(-)
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
index 16e01c81c..550193dc3 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
@@ -317,52 +317,54 @@ void EmitFPIsNan16(EmitContext& ctx, std::string value);
void EmitFPIsNan32(EmitContext& ctx, std::string value);
void EmitFPIsNan64(EmitContext& ctx, std::string value);
void EmitIAdd32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
-void EmitIAdd64(EmitContext& ctx, std::string a, std::string b);
-void EmitISub32(EmitContext& ctx, std::string a, std::string b);
-void EmitISub64(EmitContext& ctx, std::string a, std::string b);
-void EmitIMul32(EmitContext& ctx, std::string a, std::string b);
-void EmitINeg32(EmitContext& ctx, std::string value);
-void EmitINeg64(EmitContext& ctx, std::string value);
-void EmitIAbs32(EmitContext& ctx, std::string value);
-void EmitIAbs64(EmitContext& ctx, std::string value);
-void EmitShiftLeftLogical32(EmitContext& ctx, std::string base, std::string shift);
-void EmitShiftLeftLogical64(EmitContext& ctx, std::string base, std::string shift);
-void EmitShiftRightLogical32(EmitContext& ctx, std::string base, std::string shift);
-void EmitShiftRightLogical64(EmitContext& ctx, std::string base, std::string shift);
-void EmitShiftRightArithmetic32(EmitContext& ctx, std::string base, std::string shift);
-void EmitShiftRightArithmetic64(EmitContext& ctx, std::string base, std::string shift);
+void EmitIAdd64(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitISub32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitISub64(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitIMul32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitINeg32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitINeg64(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitIAbs32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitIAbs64(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitShiftLeftLogical32(EmitContext& ctx, IR::Inst* inst, std::string base, std::string shift);
+void EmitShiftLeftLogical64(EmitContext& ctx, IR::Inst* inst, std::string base, std::string shift);
+void EmitShiftRightLogical32(EmitContext& ctx, IR::Inst* inst, std::string base, std::string shift);
+void EmitShiftRightLogical64(EmitContext& ctx, IR::Inst* inst, std::string base, std::string shift);
+void EmitShiftRightArithmetic32(EmitContext& ctx, IR::Inst* inst, std::string base,
+ std::string shift);
+void EmitShiftRightArithmetic64(EmitContext& ctx, IR::Inst* inst, std::string base,
+ std::string shift);
void EmitBitwiseAnd32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
void EmitBitwiseOr32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
void EmitBitwiseXor32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
-void EmitBitFieldInsert(EmitContext& ctx, std::string base, std::string insert, std::string offset,
- std::string count);
+void EmitBitFieldInsert(EmitContext& ctx, IR::Inst* inst, std::string base, std::string insert,
+ std::string offset, std::string count);
void EmitBitFieldSExtract(EmitContext& ctx, IR::Inst* inst, std::string base, std::string offset,
std::string count);
void EmitBitFieldUExtract(EmitContext& ctx, IR::Inst* inst, std::string base, std::string offset,
std::string count);
-void EmitBitReverse32(EmitContext& ctx, std::string value);
-void EmitBitCount32(EmitContext& ctx, std::string value);
-void EmitBitwiseNot32(EmitContext& ctx, std::string value);
-void EmitFindSMsb32(EmitContext& ctx, std::string value);
-void EmitFindUMsb32(EmitContext& ctx, std::string value);
-void EmitSMin32(EmitContext& ctx, std::string a, std::string b);
-void EmitUMin32(EmitContext& ctx, std::string a, std::string b);
-void EmitSMax32(EmitContext& ctx, std::string a, std::string b);
-void EmitUMax32(EmitContext& ctx, std::string a, std::string b);
+void EmitBitReverse32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitBitCount32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitBitwiseNot32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitFindSMsb32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitFindUMsb32(EmitContext& ctx, IR::Inst* inst, std::string value);
+void EmitSMin32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitUMin32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitSMax32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
+void EmitUMax32(EmitContext& ctx, IR::Inst* inst, std::string a, std::string b);
void EmitSClamp32(EmitContext& ctx, IR::Inst* inst, std::string value, std::string min,
std::string max);
void EmitUClamp32(EmitContext& ctx, IR::Inst* inst, std::string value, std::string min,
std::string max);
-void EmitSLessThan(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitULessThan(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitIEqual(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitSLessThanEqual(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitULessThanEqual(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitSGreaterThan(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitUGreaterThan(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitINotEqual(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitSGreaterThanEqual(EmitContext& ctx, std::string lhs, std::string rhs);
-void EmitUGreaterThanEqual(EmitContext& ctx, std::string lhs, std::string rhs);
+void EmitSLessThan(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitULessThan(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitIEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitSLessThanEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitULessThanEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitSGreaterThan(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitUGreaterThan(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitINotEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitSGreaterThanEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
+void EmitUGreaterThanEqual(EmitContext& ctx, IR::Inst* inst, std::string lhs, std::string rhs);
void EmitSharedAtomicIAdd32(EmitContext& ctx, std::string pointer_offset, std::string value);
void EmitSharedAtomicSMin32(EmitContext& ctx, std::string pointer_offset, std::string value);
void EmitSharedAtomicUMin32(EmitContext& ctx, std::string pointer_offset, std::string value);
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp
index 6977f74f9..f03b2dba9 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp
@@ -16,69 +16,75 @@ void EmitIAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* in
ctx.AddU32("{}={}+{};", *inst, a, b);
}
-void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitISub32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitISub32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitISub64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitISub64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitIMul32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitIMul32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitINeg32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitINeg32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
+ ctx.AddU32("{}=-{};", *inst, value);
+}
+
+void EmitINeg64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitINeg64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitIAbs32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitIAbs32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitIAbs64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitIAbs64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitShiftLeftLogical32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string base, [[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitShiftLeftLogical32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string base,
- [[maybe_unused]] std::string shift) {
+void EmitShiftLeftLogical64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string base, [[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitShiftLeftLogical64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string base,
- [[maybe_unused]] std::string shift) {
- throw NotImplementedException("GLSL Instruction");
-}
-
-void EmitShiftRightLogical32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string base,
+void EmitShiftRightLogical32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string base,
[[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitShiftRightLogical64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string base,
+void EmitShiftRightLogical64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string base,
[[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitShiftRightArithmetic32([[maybe_unused]] EmitContext& ctx,
+void EmitShiftRightArithmetic32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
[[maybe_unused]] std::string base,
[[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitShiftRightArithmetic64([[maybe_unused]] EmitContext& ctx,
+void EmitShiftRightArithmetic64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
[[maybe_unused]] std::string base,
[[maybe_unused]] std::string shift) {
throw NotImplementedException("GLSL Instruction");
@@ -99,9 +105,9 @@ void EmitBitwiseXor32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::In
throw NotImplementedException("GLSL Instruction");
}
-void EmitBitFieldInsert([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string base,
- [[maybe_unused]] std::string insert, [[maybe_unused]] std::string offset,
- std::string count) {
+void EmitBitFieldInsert([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string base, [[maybe_unused]] std::string insert,
+ [[maybe_unused]] std::string offset, std::string count) {
throw NotImplementedException("GLSL Instruction");
}
@@ -117,43 +123,48 @@ void EmitBitFieldUExtract([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR
throw NotImplementedException("GLSL Instruction");
}
-void EmitBitReverse32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitBitReverse32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitBitCount32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitBitCount32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitBitwiseNot32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitBitwiseNot32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitFindSMsb32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitFindSMsb32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitFindUMsb32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string value) {
+void EmitFindUMsb32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string value) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitSMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitSMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitUMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitUMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitSMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitSMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitUMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string a,
- [[maybe_unused]] std::string b) {
+void EmitUMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string a, [[maybe_unused]] std::string b) {
throw NotImplementedException("GLSL Instruction");
}
@@ -169,53 +180,53 @@ void EmitUClamp32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst*
throw NotImplementedException("GLSL Instruction");
}
-void EmitSLessThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitSLessThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitULessThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitULessThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitIEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitIEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitSLessThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitSLessThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitULessThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitULessThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitSGreaterThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitSGreaterThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitUGreaterThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitUGreaterThan([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitINotEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitINotEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitSGreaterThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitSGreaterThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
-void EmitUGreaterThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string lhs,
- [[maybe_unused]] std::string rhs) {
+void EmitUGreaterThanEqual([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst* inst,
+ [[maybe_unused]] std::string lhs, [[maybe_unused]] std::string rhs) {
throw NotImplementedException("GLSL Instruction");
}
} // namespace Shader::Backend::GLSL
diff --git a/src/shader_recompiler/backend/glsl/reg_alloc.cpp b/src/shader_recompiler/backend/glsl/reg_alloc.cpp
index 5ad1872db..f4886dbfd 100644
--- a/src/shader_recompiler/backend/glsl/reg_alloc.cpp
+++ b/src/shader_recompiler/backend/glsl/reg_alloc.cpp
@@ -51,8 +51,7 @@ std::string RegAlloc::Define(IR::Inst& inst, Type type) {
}
std::string RegAlloc::Consume(const IR::Value& value) {
- const auto result = value.IsImmediate() ? MakeImm(value) : Consume(*value.InstRecursive());
- return result;
+ return value.IsImmediate() ? MakeImm(value) : Consume(*value.InstRecursive());
}
std::string RegAlloc::Consume(IR::Inst& inst) {