From 80a879cb447507822e19acb0e51e123b768acd61 Mon Sep 17 00:00:00 2001
From: Nicholas Rodine <halfofastaple@gmail.com>
Date: Wed, 17 Aug 2022 18:49:43 -0500
Subject: Fix SpirV parse failure (#3597)

* Added .ToString overrides, to help diagnose and debug SpirV generated code.

* Added Spirv to team shared dictionary, so the word will not show up as a warning.

* Fixed bug where we were creating invalid constants (bool 0i and float 0i)

* Update Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

* Update Spv.Generator/Instruction.cs

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

* Adjusted spacing to match style of the rest of the code.

* Added handler for FP64(double) as well, for undefined aggregate types.

* Made the operand labels a static dictionary, to avoid re-allocation on each call.
Replaced Contains/Get with a TryGetValue, to reduce the number of dictionary lookups.

* Added newline between AllOperands and ToString().

Co-authored-by: gdkchan <gab.dark.100@gmail.com>
---
 Spv.Generator/Instruction.cs         | 15 +++++++++++++++
 Spv.Generator/InstructionOperands.cs | 19 +++++++++++++++++++
 Spv.Generator/LiteralInteger.cs      |  2 ++
 Spv.Generator/LiteralString.cs       |  2 ++
 4 files changed, 38 insertions(+)

(limited to 'Spv.Generator')

diff --git a/Spv.Generator/Instruction.cs b/Spv.Generator/Instruction.cs
index 27190f05..8ecfe683 100644
--- a/Spv.Generator/Instruction.cs
+++ b/Spv.Generator/Instruction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 
@@ -228,5 +229,19 @@ namespace Spv.Generator
         {
             return obj is Instruction instruction && Equals(instruction);
         }
+        
+        private static readonly Dictionary<Specification.Op, string[]> _operandLabels = new()
+        {
+            { Specification.Op.OpConstant, new [] { "Value" } },
+            { Specification.Op.OpTypeInt, new [] { "Width", "Signed" } },
+            { Specification.Op.OpTypeFloat, new [] { "Width" } }
+        };
+
+        public override string ToString()
+        {
+            var labels = _operandLabels.TryGetValue(Opcode, out var opLabels) ? opLabels : Array.Empty<string>();
+            var result = _resultType == null ? string.Empty : $"{_resultType} ";
+            return $"{result}{Opcode}{_operands.ToString(labels)}";
+        }
     }
 }
diff --git a/Spv.Generator/InstructionOperands.cs b/Spv.Generator/InstructionOperands.cs
index a349827a..c48b004f 100644
--- a/Spv.Generator/InstructionOperands.cs
+++ b/Spv.Generator/InstructionOperands.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 namespace Spv.Generator
@@ -49,5 +51,22 @@ namespace Spv.Generator
                 Overflow[Count++] = operand;
             }
         }
+
+        private IEnumerable<Operand> AllOperands => new[] { Operand1, Operand2, Operand3, Operand4, Operand5 }
+            .Concat(Overflow ?? Array.Empty<Operand>())
+            .Take(Count);
+
+        public override string ToString()
+        {
+            return $"({string.Join(", ", AllOperands)})";
+        }
+
+        public string ToString(string[] labels)
+        {
+            var labeledParams = AllOperands.Zip(labels, (op, label) => $"{label}: {op}");
+            var unlabeledParams = AllOperands.Skip(labels.Length).Select(op => op.ToString());
+            var paramsToPrint = labeledParams.Concat(unlabeledParams);
+            return $"({string.Join(", ", paramsToPrint)})";
+        }
     }
 }
diff --git a/Spv.Generator/LiteralInteger.cs b/Spv.Generator/LiteralInteger.cs
index 3193ed6e..22cb5484 100644
--- a/Spv.Generator/LiteralInteger.cs
+++ b/Spv.Generator/LiteralInteger.cs
@@ -99,5 +99,7 @@ namespace Spv.Generator
         {
             return obj is LiteralInteger literalInteger && Equals(literalInteger);
         }
+
+        public override string ToString() => $"{_integerType} {_data}";
     }
 }
diff --git a/Spv.Generator/LiteralString.cs b/Spv.Generator/LiteralString.cs
index 4ed9e52b..629ff7bf 100644
--- a/Spv.Generator/LiteralString.cs
+++ b/Spv.Generator/LiteralString.cs
@@ -48,5 +48,7 @@ namespace Spv.Generator
         {
             return obj is LiteralString literalString && Equals(literalString);
         }
+
+        public override string ToString() => _value;
     }
 }
-- 
cgit v1.2.3