CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glasm: Use CMP.S for Select32 

also fixes ADD and SUB to use U modifier
This commit is contained in:
ameerj 2021-05-08 19:21:32 -04:00
parent 68cc445b8e
commit 934d300246
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
View File

@ -214,8 +214,8 @@ void EmitSelectU64(EmitContext& ctx, std::string_view cond, std::string_view tru
std::string_view false_value); std::string_view false_value);
void EmitSelectF16(EmitContext& ctx, std::string_view cond, std::string_view true_value, void EmitSelectF16(EmitContext& ctx, std::string_view cond, std::string_view true_value,
std::string_view false_value); std::string_view false_value);
void EmitSelectF32(EmitContext& ctx, std::string_view cond, std::string_view true_value, void EmitSelectF32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
std::string_view false_value); std::string_view true_value, std::string_view false_value);
void EmitSelectF64(EmitContext& ctx, std::string_view cond, std::string_view true_value, void EmitSelectF64(EmitContext& ctx, std::string_view cond, std::string_view true_value,
std::string_view false_value); std::string_view false_value);
void EmitBitCastU16F16(EmitContext& ctx, IR::Inst& inst, const IR::Value& value); void EmitBitCastU16F16(EmitContext& ctx, IR::Inst& inst, const IR::Value& value);

4
src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp
View File

@ -12,7 +12,7 @@ namespace Shader::Backend::GLASM {
void EmitIAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitIAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) { [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
ctx.Add("ADD {},{},{};", inst, a, b); ctx.Add("ADD.U {},{},{};", inst, a, b);
} }
void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@ -22,7 +22,7 @@ void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& in
void EmitISub32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitISub32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) { [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
ctx.Add("SUB {},{},{};", inst, a, b); ctx.Add("SUB.U {},{},{};", inst, a, b);
} }
void EmitISub64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitISub64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,

12
src/shader_recompiler/backend/glasm/emit_glasm_select.cpp
View File

@ -24,12 +24,7 @@ void EmitSelectU16(EmitContext&, std::string_view, std::string_view, std::string
void EmitSelectU32(EmitContext& ctx, IR::Inst& inst, std::string_view cond, void EmitSelectU32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
std::string_view true_value, std::string_view false_value) { std::string_view true_value, std::string_view false_value) {
ctx.Add("MOV.U.CC RC,{};", cond); ctx.Add("CMP.S {},{},{},{};", inst, cond, true_value, false_value);
ctx.Add("IF NE.x;");
ctx.Add("MOV.U {},{};", inst, true_value);
ctx.Add("ELSE;");
ctx.Add("MOV.U {},{};", inst, false_value);
ctx.Add("ENDIF;");
} }
void EmitSelectU64(EmitContext&, std::string_view, std::string_view, std::string_view) { void EmitSelectU64(EmitContext&, std::string_view, std::string_view, std::string_view) {
@ -40,8 +35,9 @@ void EmitSelectF16(EmitContext&, std::string_view, std::string_view, std::string
throw NotImplementedException("GLASM instruction"); throw NotImplementedException("GLASM instruction");
} }
void EmitSelectF32(EmitContext&, std::string_view, std::string_view, std::string_view) { void EmitSelectF32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
throw NotImplementedException("GLASM instruction"); std::string_view true_value, std::string_view false_value) {
ctx.Add("CMP.S {},{},{},{};", inst, cond, true_value, false_value);
} }
void EmitSelectF64(EmitContext&, std::string_view, std::string_view, std::string_view) { void EmitSelectF64(EmitContext&, std::string_view, std::string_view, std::string_view) {