From 315864aaae14f04821ae67fd1ea068ea5b7d73f4 Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Fri, 15 Nov 2024 14:53:00 +0300
Subject: [PATCH] gpu: shader: fix s_mulk_i32, implement s_addk_i32

---
 rpcsx/gpu/lib/gcn-shader/shaders/rdna.glsl    | 8 +++++++-
 rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rpcsx/gpu/lib/gcn-shader/shaders/rdna.glsl b/rpcsx/gpu/lib/gcn-shader/shaders/rdna.glsl
index fb4b348fb..e06daf7b4 100644
--- a/rpcsx/gpu/lib/gcn-shader/shaders/rdna.glsl
+++ b/rpcsx/gpu/lib/gcn-shader/shaders/rdna.glsl
@@ -1332,7 +1332,13 @@ int64_t s_ashr_i64(int64_t x, uint32_t y) { int64_t result = x >> (y & 0x3f); sc
 uint32_t s_bfm_b32(uint32_t x, uint32_t y) { uint32_t result = ((1 << (x & 0x1f)) - 1) << (y & 0x1f); scc = result != 0; return result; }
 uint64_t s_bfm_b64(uint64_t x, uint64_t y) { uint64_t result = ((uint64_t(1) << (x & 0x1f)) - 1) << (y & 0x1f); scc = result != 0; return result; }
 int32_t s_mul_i32(int32_t x, int32_t y) { return x * y; }
-int32_t s_mulk_i32(int32_t x, int32_t y) { return x * y; }
+void s_mulk_i32(inout int32_t x, int32_t y) { x = x * y; }
+void s_addk_i32(inout int32_t x, int32_t y) {
+    int32_t result = x + y;
+    scc = sign(x) == sign(y) && sign(result) != sign(x);
+    x = result;
+}
+
 int32_t s_abs_i32(int32_t x) {
     int32_t result = abs(x);
     scc = result == 0;
diff --git a/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp b/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
index 52ca73105..48d662cdd 100644
--- a/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
+++ b/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
@@ -1185,7 +1185,7 @@ static void instructionsToSpv(GcnConverter &converter, gcn::Import &importer,
         semanticModuleInfo.findSemanticOf(inst.getInstId()) == nullptr) {
       std::println(std::cerr, "unimplemented semantic: ");
       inst.print(std::cerr, context.ns);
-      std::println(std::cerr);
+      std::println(std::cerr, "\n");
 
       std::vector<ir::Instruction> workList;
       std::set<ir::Instruction> removed;
@@ -1202,7 +1202,7 @@ static void instructionsToSpv(GcnConverter &converter, gcn::Import &importer,
 
         std::println(std::cerr, "removing ");
         inst.print(std::cerr, context.ns);
-        std::println(std::cerr);
+        std::println(std::cerr, "\n");
 
         if (auto value = inst.cast<ir::Value>()) {
           for (auto &use : value.getUseList()) {