catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shader_recompiler: added `NOP` and `RSQ` instructions

This commit is contained in:
psucien 2024-05-30 09:43:49 +02:00
parent d05cbd88bb
commit 3741f013a3
8 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
View File

@ -122,6 +122,10 @@ Id EmitFPSqrt(EmitContext& ctx, Id value) {
return ctx.OpSqrt(ctx.F32[1], value); return ctx.OpSqrt(ctx.F32[1], value);
} }
Id EmitFPInvSqrt(EmitContext& ctx, Id value) {
return ctx.OpInverseSqrt(ctx.F32[1], value);
}
Id EmitFPSaturate16(EmitContext& ctx, Id value) { Id EmitFPSaturate16(EmitContext& ctx, Id value) {
const Id zero{ctx.Constant(ctx.F16[1], u16{0})}; const Id zero{ctx.Constant(ctx.F16[1], u16{0})};
const Id one{ctx.Constant(ctx.F16[1], u16{0x3c00})}; const Id one{ctx.Constant(ctx.F16[1], u16{0x3c00})};

1
src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
View File

@ -174,6 +174,7 @@ Id EmitFPRecip64(EmitContext& ctx, Id value);
Id EmitFPRecipSqrt32(EmitContext& ctx, Id value); Id EmitFPRecipSqrt32(EmitContext& ctx, Id value);
Id EmitFPRecipSqrt64(EmitContext& ctx, Id value); Id EmitFPRecipSqrt64(EmitContext& ctx, Id value);
Id EmitFPSqrt(EmitContext& ctx, Id value); Id EmitFPSqrt(EmitContext& ctx, Id value);
Id EmitFPInvSqrt(EmitContext& ctx, Id value);
Id EmitFPSaturate16(EmitContext& ctx, Id value); Id EmitFPSaturate16(EmitContext& ctx, Id value);
Id EmitFPSaturate32(EmitContext& ctx, Id value); Id EmitFPSaturate32(EmitContext& ctx, Id value);
Id EmitFPSaturate64(EmitContext& ctx, Id value); Id EmitFPSaturate64(EmitContext& ctx, Id value);

4
src/shader_recompiler/frontend/translate/translate.cpp
View File

@ -321,9 +321,13 @@ void Translate(IR::Block* block, std::span<const GcnInst> inst_list, Info& info)
case Opcode::V_MAX_F32: case Opcode::V_MAX_F32:
translator.V_MAX_F32(inst); translator.V_MAX_F32(inst);
break; break;
case Opcode::V_RSQ_F32:
translator.V_RSQ_F32(inst);
break;
case Opcode::S_ANDN2_B64: case Opcode::S_ANDN2_B64:
translator.S_ANDN2_B64(inst); translator.S_ANDN2_B64(inst);
break; break;
case Opcode::S_NOP:
case Opcode::S_CBRANCH_EXECZ: case Opcode::S_CBRANCH_EXECZ:
case Opcode::S_CBRANCH_SCC0: case Opcode::S_CBRANCH_SCC0:
case Opcode::S_MOV_B64: case Opcode::S_MOV_B64:

1
src/shader_recompiler/frontend/translate/translate.h
View File

@ -67,6 +67,7 @@ public:
void V_FMA_F32(const GcnInst& inst); void V_FMA_F32(const GcnInst& inst);
void V_CMP_F32(ConditionOp op, const GcnInst& inst); void V_CMP_F32(ConditionOp op, const GcnInst& inst);
void V_MAX_F32(const GcnInst& inst); void V_MAX_F32(const GcnInst& inst);
void V_RSQ_F32(const GcnInst& inst);
// Vector Memory // Vector Memory
void BUFFER_LOAD_FORMAT(u32 num_dwords, bool is_typed, const GcnInst& inst); void BUFFER_LOAD_FORMAT(u32 num_dwords, bool is_typed, const GcnInst& inst);

5
src/shader_recompiler/frontend/translate/vector_alu.cpp
View File

@ -193,4 +193,9 @@ void Translator::V_MAX_F32(const GcnInst& inst) {
SetDst(inst.dst[0], ir.FPMax(src0, src1)); SetDst(inst.dst[0], ir.FPMax(src0, src1));
} }
void Translator::V_RSQ_F32(const GcnInst& inst) {
const IR::F32 src0{GetSrc(inst.src[0], true)};
SetDst(inst.dst[0], ir.FPInvSqrt(src0));
}
} // namespace Shader::Gcn } // namespace Shader::Gcn

4
src/shader_recompiler/ir/ir_emitter.cpp
View File

@ -609,6 +609,10 @@ F32 IREmitter::FPSqrt(const F32& value) {
return Inst<F32>(Opcode::FPSqrt, value); return Inst<F32>(Opcode::FPSqrt, value);
} }
F32 IREmitter::FPInvSqrt(const F32& value) {
return Inst<F32>(Opcode::FPInvSqrt, value);
}
F32F64 IREmitter::FPSaturate(const F32F64& value) { F32F64 IREmitter::FPSaturate(const F32F64& value) {
switch (value.Type()) { switch (value.Type()) {
case Type::F32: case Type::F32:

1
src/shader_recompiler/ir/ir_emitter.h
View File

@ -123,6 +123,7 @@ public:
[[nodiscard]] F32F64 FPRecip(const F32F64& value); [[nodiscard]] F32F64 FPRecip(const F32F64& value);
[[nodiscard]] F32F64 FPRecipSqrt(const F32F64& value); [[nodiscard]] F32F64 FPRecipSqrt(const F32F64& value);
[[nodiscard]] F32 FPSqrt(const F32& value); [[nodiscard]] F32 FPSqrt(const F32& value);
[[nodiscard]] F32 FPInvSqrt(const F32& value);
[[nodiscard]] F32F64 FPSaturate(const F32F64& value); [[nodiscard]] F32F64 FPSaturate(const F32F64& value);
[[nodiscard]] F32F64 FPClamp(const F32F64& value, const F32F64& min_value, [[nodiscard]] F32F64 FPClamp(const F32F64& value, const F32F64& min_value,
const F32F64& max_value); const F32F64& max_value);

1
src/shader_recompiler/ir/opcodes.inc
View File

@ -142,6 +142,7 @@ OPCODE(FPRecip64, F64, F64,
OPCODE(FPRecipSqrt32, F32, F32, ) OPCODE(FPRecipSqrt32, F32, F32, )
OPCODE(FPRecipSqrt64, F64, F64, ) OPCODE(FPRecipSqrt64, F64, F64, )
OPCODE(FPSqrt, F32, F32, ) OPCODE(FPSqrt, F32, F32, )
OPCODE(FPInvSqrt, F32, F32, )
OPCODE(FPSin, F32, F32, ) OPCODE(FPSin, F32, F32, )
OPCODE(FPExp2, F32, F32, ) OPCODE(FPExp2, F32, F32, )
OPCODE(FPCos, F32, F32, ) OPCODE(FPCos, F32, F32, )