New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
using Ryujinx.Graphics.Shader.IntermediateRepresentation;
|
|
|
|
using Ryujinx.Graphics.Shader.StructuredIr;
|
|
|
|
|
|
|
|
using static Ryujinx.Graphics.Shader.CodeGen.Glsl.TypeConversion;
|
|
|
|
|
|
|
|
namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
|
|
|
|
{
|
|
|
|
static class InstGenHelper
|
|
|
|
{
|
|
|
|
private static InstInfo[] _infoTbl;
|
|
|
|
|
|
|
|
static InstGenHelper()
|
|
|
|
{
|
|
|
|
_infoTbl = new InstInfo[(int)Instruction.Count];
|
|
|
|
|
|
|
|
Add(Instruction.Absolute, InstType.CallUnary, "abs");
|
|
|
|
Add(Instruction.Add, InstType.OpBinaryCom, "+", 2);
|
|
|
|
Add(Instruction.BitfieldExtractS32, InstType.CallTernary, "bitfieldExtract");
|
|
|
|
Add(Instruction.BitfieldExtractU32, InstType.CallTernary, "bitfieldExtract");
|
|
|
|
Add(Instruction.BitfieldInsert, InstType.CallQuaternary, "bitfieldInsert");
|
|
|
|
Add(Instruction.BitfieldReverse, InstType.CallUnary, "bitfieldReverse");
|
|
|
|
Add(Instruction.BitwiseAnd, InstType.OpBinaryCom, "&", 6);
|
|
|
|
Add(Instruction.BitwiseExclusiveOr, InstType.OpBinaryCom, "^", 7);
|
|
|
|
Add(Instruction.BitwiseNot, InstType.OpUnary, "~", 0);
|
|
|
|
Add(Instruction.BitwiseOr, InstType.OpBinaryCom, "|", 8);
|
|
|
|
Add(Instruction.Ceiling, InstType.CallUnary, "ceil");
|
|
|
|
Add(Instruction.Clamp, InstType.CallTernary, "clamp");
|
|
|
|
Add(Instruction.ClampU32, InstType.CallTernary, "clamp");
|
|
|
|
Add(Instruction.CompareEqual, InstType.OpBinaryCom, "==", 5);
|
|
|
|
Add(Instruction.CompareGreater, InstType.OpBinary, ">", 4);
|
|
|
|
Add(Instruction.CompareGreaterOrEqual, InstType.OpBinary, ">=", 4);
|
|
|
|
Add(Instruction.CompareGreaterOrEqualU32, InstType.OpBinary, ">=", 4);
|
|
|
|
Add(Instruction.CompareGreaterU32, InstType.OpBinary, ">", 4);
|
|
|
|
Add(Instruction.CompareLess, InstType.OpBinary, "<", 4);
|
|
|
|
Add(Instruction.CompareLessOrEqual, InstType.OpBinary, "<=", 4);
|
|
|
|
Add(Instruction.CompareLessOrEqualU32, InstType.OpBinary, "<=", 4);
|
|
|
|
Add(Instruction.CompareLessU32, InstType.OpBinary, "<", 4);
|
|
|
|
Add(Instruction.CompareNotEqual, InstType.OpBinaryCom, "!=", 5);
|
|
|
|
Add(Instruction.ConditionalSelect, InstType.OpTernary, "?:", 12);
|
|
|
|
Add(Instruction.ConvertFPToS32, InstType.CallUnary, "int");
|
|
|
|
Add(Instruction.ConvertS32ToFP, InstType.CallUnary, "float");
|
|
|
|
Add(Instruction.ConvertU32ToFP, InstType.CallUnary, "float");
|
|
|
|
Add(Instruction.Cosine, InstType.CallUnary, "cos");
|
|
|
|
Add(Instruction.Discard, InstType.OpNullary, "discard");
|
|
|
|
Add(Instruction.Divide, InstType.OpBinary, "/", 1);
|
|
|
|
Add(Instruction.EmitVertex, InstType.CallNullary, "EmitVertex");
|
|
|
|
Add(Instruction.EndPrimitive, InstType.CallNullary, "EndPrimitive");
|
|
|
|
Add(Instruction.ExponentB2, InstType.CallUnary, "exp2");
|
|
|
|
Add(Instruction.Floor, InstType.CallUnary, "floor");
|
|
|
|
Add(Instruction.FusedMultiplyAdd, InstType.CallTernary, "fma");
|
2019-10-18 02:41:18 +00:00
|
|
|
Add(Instruction.ImageLoad, InstType.Special);
|
|
|
|
Add(Instruction.ImageStore, InstType.Special);
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
Add(Instruction.IsNan, InstType.CallUnary, "isnan");
|
2019-10-13 06:02:07 +00:00
|
|
|
Add(Instruction.LoadAttribute, InstType.Special);
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
Add(Instruction.LoadConstant, InstType.Special);
|
2019-10-13 06:02:07 +00:00
|
|
|
Add(Instruction.LoadLocal, InstType.Special);
|
|
|
|
Add(Instruction.LoadStorage, InstType.Special);
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
Add(Instruction.LogarithmB2, InstType.CallUnary, "log2");
|
|
|
|
Add(Instruction.LogicalAnd, InstType.OpBinaryCom, "&&", 9);
|
|
|
|
Add(Instruction.LogicalExclusiveOr, InstType.OpBinaryCom, "^^", 10);
|
|
|
|
Add(Instruction.LogicalNot, InstType.OpUnary, "!", 0);
|
|
|
|
Add(Instruction.LogicalOr, InstType.OpBinaryCom, "||", 11);
|
|
|
|
Add(Instruction.LoopBreak, InstType.OpNullary, "break");
|
|
|
|
Add(Instruction.LoopContinue, InstType.OpNullary, "continue");
|
|
|
|
Add(Instruction.PackHalf2x16, InstType.Special);
|
|
|
|
Add(Instruction.ShiftLeft, InstType.OpBinary, "<<", 3);
|
|
|
|
Add(Instruction.ShiftRightS32, InstType.OpBinary, ">>", 3);
|
|
|
|
Add(Instruction.ShiftRightU32, InstType.OpBinary, ">>", 3);
|
|
|
|
Add(Instruction.Maximum, InstType.CallBinary, "max");
|
|
|
|
Add(Instruction.MaximumU32, InstType.CallBinary, "max");
|
|
|
|
Add(Instruction.Minimum, InstType.CallBinary, "min");
|
|
|
|
Add(Instruction.MinimumU32, InstType.CallBinary, "min");
|
|
|
|
Add(Instruction.Multiply, InstType.OpBinaryCom, "*", 1);
|
|
|
|
Add(Instruction.Negate, InstType.OpUnary, "-", 0);
|
|
|
|
Add(Instruction.ReciprocalSquareRoot, InstType.CallUnary, "inversesqrt");
|
|
|
|
Add(Instruction.Return, InstType.OpNullary, "return");
|
|
|
|
Add(Instruction.Sine, InstType.CallUnary, "sin");
|
|
|
|
Add(Instruction.SquareRoot, InstType.CallUnary, "sqrt");
|
2019-10-13 06:02:07 +00:00
|
|
|
Add(Instruction.StoreLocal, InstType.Special);
|
|
|
|
Add(Instruction.StoreStorage, InstType.Special);
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
Add(Instruction.Subtract, InstType.OpBinary, "-", 2);
|
|
|
|
Add(Instruction.TextureSample, InstType.Special);
|
|
|
|
Add(Instruction.TextureSize, InstType.Special);
|
|
|
|
Add(Instruction.Truncate, InstType.CallUnary, "trunc");
|
|
|
|
Add(Instruction.UnpackHalf2x16, InstType.Special);
|
|
|
|
}
|
|
|
|
|
|
|
|
private static void Add(Instruction inst, InstType flags, string opName = null, int precedence = 0)
|
|
|
|
{
|
|
|
|
_infoTbl[(int)inst] = new InstInfo(flags, opName, precedence);
|
|
|
|
}
|
|
|
|
|
|
|
|
public static InstInfo GetInstructionInfo(Instruction inst)
|
|
|
|
{
|
|
|
|
return _infoTbl[(int)(inst & Instruction.Mask)];
|
|
|
|
}
|
|
|
|
|
|
|
|
public static string GetSoureExpr(CodeGenContext context, IAstNode node, VariableType dstType)
|
|
|
|
{
|
|
|
|
return ReinterpretCast(context, node, OperandManager.GetNodeDestType(node), dstType);
|
|
|
|
}
|
|
|
|
|
|
|
|
public static string Enclose(string expr, IAstNode node, Instruction pInst, bool isLhs)
|
|
|
|
{
|
|
|
|
InstInfo pInfo = GetInstructionInfo(pInst);
|
|
|
|
|
|
|
|
return Enclose(expr, node, pInst, pInfo, isLhs);
|
|
|
|
}
|
|
|
|
|
|
|
|
public static string Enclose(string expr, IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs = false)
|
|
|
|
{
|
|
|
|
if (NeedsParenthesis(node, pInst, pInfo, isLhs))
|
|
|
|
{
|
|
|
|
expr = "(" + expr + ")";
|
|
|
|
}
|
|
|
|
|
|
|
|
return expr;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static bool NeedsParenthesis(IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs)
|
|
|
|
{
|
2019-07-02 02:39:22 +00:00
|
|
|
// If the node isn't a operation, then it can only be a operand,
|
|
|
|
// and those never needs to be surrounded in parenthesis.
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
if (!(node is AstOperation operation))
|
|
|
|
{
|
2019-07-02 02:39:22 +00:00
|
|
|
// This is sort of a special case, if this is a negative constant,
|
|
|
|
// and it is consumed by a unary operation, we need to put on the parenthesis,
|
|
|
|
// as in GLSL a sequence like --2 or ~-1 is not valid.
|
New shader translator implementation (#654)
* Start implementing a new shader translator
* Fix shift instructions and a typo
* Small refactoring on StructuredProgram, move RemovePhis method to a separate class
* Initial geometry shader support
* Implement TLD4
* Fix -- There's no negation on FMUL32I
* Add constant folding and algebraic simplification optimizations, nits
* Some leftovers from constant folding
* Avoid cast for constant assignments
* Add a branch elimination pass, and misc small fixes
* Remove redundant branches, add expression propagation and other improvements on the code
* Small leftovers -- add missing break and continue, remove unused properties, other improvements
* Add null check to handle empty block cases on block visitor
* Add HADD2 and HMUL2 half float shader instructions
* Optimize pack/unpack sequences, some fixes related to half float instructions
* Add TXQ, TLD, TLDS and TLD4S shader texture instructions, and some support for bindless textures, some refactoring on codegen
* Fix copy paste mistake that caused RZ to be ignored on the AST instruction
* Add workaround for conditional exit, and fix half float instruction with constant buffer
* Add missing 0.0 source for TLDS.LZ variants
* Simplify the switch for TLDS.LZ
* Texture instructions related fixes
* Implement the HFMA instruction, and some misc. fixes
* Enable constant folding on UnpackHalf2x16 instructions
* Refactor HFMA to use OpCode* for opcode decoding rather than on the helper methods
* Remove the old shader translator
* Remove ShaderDeclInfo and other unused things
* Add dual vertex shader support
* Add ShaderConfig, used to pass shader type and maximum cbuffer size
* Move and rename some instruction enums
* Move texture instructions into a separate file
* Move operand GetExpression and locals management to OperandManager
* Optimize opcode decoding using a simple list and binary search
* Add missing condition for do-while on goto elimination
* Misc. fixes on texture instructions
* Simplify TLDS switch
* Address PR feedback, and a nit
2019-04-17 23:57:08 +00:00
|
|
|
if (IsNegativeConst(node) && pInfo.Type == InstType.OpUnary)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((pInfo.Type & (InstType.Call | InstType.Special)) != 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
InstInfo info = _infoTbl[(int)(operation.Inst & Instruction.Mask)];
|
|
|
|
|
|
|
|
if ((info.Type & (InstType.Call | InstType.Special)) != 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info.Precedence < pInfo.Precedence)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info.Precedence == pInfo.Precedence && isLhs)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pInst == operation.Inst && info.Type == InstType.OpBinaryCom)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
private static bool IsNegativeConst(IAstNode node)
|
|
|
|
{
|
|
|
|
if (!(node is AstOperand operand))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return operand.Type == OperandType.Constant && operand.Value < 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|