Merge branch 'develop' of https://github.com/vortexgpgpu/vortex into …

…develop
vortexgpgpu · Sep 8, 2024 · d47b822 · d47b822
2 parents eb0c67f + 6626f92
commit d47b822
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/hw/rtl/VX_gpu_pkg.sv b/hw/rtl/VX_gpu_pkg.sv
@@ -442,8 +442,10 @@ package VX_gpu_pkg;
         case (ex_type)
             `EX_ALU: `TRACE(level, ("ALU"));
             `EX_LSU: `TRACE(level, ("LSU"));
-            `EX_FPU: `TRACE(level, ("FPU"));
             `EX_SFU: `TRACE(level, ("SFU"));
+        `ifdef EXT_F_ENABLE
+            `EX_FPU: `TRACE(level, ("FPU"));
+        `endif
             default: `TRACE(level, ("?"));
         endcase
     endtask
@@ -789,14 +791,16 @@ package VX_gpu_pkg;
         `EX_LSU: begin
             `TRACE(level, (", offset=0x%0h", op_args.lsu.offset));
         end
-        `EX_FPU: begin
-            `TRACE(level, (", fmt=0x%0h, frm=0x%0h", op_args.fpu.fmt, op_args.fpu.frm));
-        end
         `EX_SFU: begin
             if (`INST_SFU_IS_CSR(op_type)) begin
                 `TRACE(level, (", addr=0x%0h, use_imm=%b, imm=0x%0h", op_args.csr.addr, op_args.csr.use_imm, op_args.csr.imm));
             end
         end
+    `ifdef EXT_F_ENABLE
+        `EX_FPU: begin
+            `TRACE(level, (", fmt=0x%0h, frm=0x%0h", op_args.fpu.fmt, op_args.fpu.frm));
+        end
+    `endif
         default:;
         endcase
     endtask

diff --git a/hw/rtl/core/VX_issue_slice.sv b/hw/rtl/core/VX_issue_slice.sv
@@ -135,7 +135,7 @@ module VX_issue_slice import VX_gpu_pkg::*; #(
 `ifdef DBG_TRACE_PIPELINE
     always @(posedge clk) begin
         if (operands_if.valid && operands_if.ready) begin
-            `TRACE(1, ("%d: %s wid=%0d, PC=0x%0h, ex=", $time, INSTANCE_ID, wis_to_wid(operands_if.data.wis, ISSUE_ID), {operands_if.data.PC, 1'b0}));
+            `TRACE(1, ("%d: %s: wid=%0d, PC=0x%0h, ex=", $time, INSTANCE_ID, wis_to_wid(operands_if.data.wis, ISSUE_ID), {operands_if.data.PC, 1'b0}));
             trace_ex_type(1, operands_if.data.ex_type);
             `TRACE(1, (", op="));
             trace_ex_op(1, operands_if.data.ex_type, operands_if.data.op_type, operands_if.data.op_args);