uuid_gen cleanup

Author: tinebp

hw/dpi/util_dpi.cpp

@@ -21,8 +21,6 @@
 #include "svdpi.h"
 #include "verilated_vpi.h"
 
-#include "uuid_gen.h"
-
 #ifdef XLEN_64
 #define iword_t   int64_t
 #define uword_t   uint64_t
@@ -50,7 +48,7 @@ extern "C" {
   void dpi_trace_start();
   void dpi_trace_stop();
 
-  uint64_t dpi_uuid_gen(bool reset, int wid, uint64_t PC);
+  uint64_t dpi_uuid_gen(bool reset, int wid);
 }
 
 bool sim_trace_enabled();
@@ -209,22 +207,14 @@ void dpi_trace_stop() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-std::unordered_map<uint32_t, std::shared_ptr<vortex::UUIDGenerator>> g_uuid_gens;
+std::unordered_map<uint32_t, uint32_t> g_uuid_gens;
 
-uint64_t dpi_uuid_gen(bool reset, int wid, uint64_t PC) {
+uint64_t dpi_uuid_gen(bool reset, int wid) {
   if (reset) {
     g_uuid_gens.clear();
     return 0;
   }
-  std::shared_ptr<vortex::UUIDGenerator> uuid_gen;
-  auto it = g_uuid_gens.find(wid);
-  if (it == g_uuid_gens.end()) {
-    uuid_gen = std::make_shared<vortex::UUIDGenerator>();
-    g_uuid_gens.emplace(wid, uuid_gen);
-  } else {
-    uuid_gen = it->second;
-  }
-  uint32_t instr_uuid = uuid_gen->get_uuid(PC);
+  uint32_t instr_uuid = g_uuid_gens[wid]++;
   uint64_t uuid = (uint64_t(wid) << 32) | instr_uuid;
   return uuid;
 }

hw/dpi/util_dpi.vh

@@ -1,10 +1,10 @@
 // Copyright © 2019-2023
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,6 +32,6 @@ import "DPI-C" function void dpi_trace(input int level, input string format /*ve
 import "DPI-C" function void dpi_trace_start();
 import "DPI-C" function void dpi_trace_stop();
 
-import "DPI-C" function longint dpi_uuid_gen(input logic reset, input int wid, input longint PC);
+import "DPI-C" function longint dpi_uuid_gen(input logic reset, input int wid);
 
 `endif

hw/rtl/core/VX_schedule.sv

@@ -338,9 +338,9 @@ module VX_schedule import VX_gpu_pkg::*; #(
 `ifdef SV_DPI
     always @(posedge clk) begin
         if (reset) begin
-            instr_uuid <= `UUID_WIDTH'(dpi_uuid_gen(1, 0, 0));
+            instr_uuid <= `UUID_WIDTH'(dpi_uuid_gen(1, 32'd0));
         end else if (schedule_fire) begin
-            instr_uuid <= `UUID_WIDTH'(dpi_uuid_gen(0, 32'(g_wid), 64'(schedule_pc)));
+            instr_uuid <= `UUID_WIDTH'(dpi_uuid_gen(0, 32'(g_wid)));
         end
     end
 `else

hw/rtl/core/VX_trace.vh

@@ -303,7 +303,7 @@
                 end
                 `INST_FPU_MISC: begin
                     if  (op_args.fpu.fmt[0]) begin
-                        case (op_args)
+                        case (op_args.fpu.frm)
                             0: `TRACE(level, ("FSGNJ.D"));
                             1: `TRACE(level, ("FSGNJN.D"));
                             2: `TRACE(level, ("FSGNJX.D"));
@@ -314,7 +314,7 @@
                             7: `TRACE(level, ("FMAX.D"));
                         endcase
                     end else begin
-                        case (op_args)
+                        case (op_args.fpu.frm)
                             0: `TRACE(level, ("FSGNJ.S"));
                             1: `TRACE(level, ("FSGNJN.S"));
                             2: `TRACE(level, ("FSGNJX.S"));

sim/common/uuid_gen.h

@@ -44,6 +44,7 @@ Emulator::ipdom_entry_t::ipdom_entry_t(const ThreadMask &tmask)
 Emulator::warp_t::warp_t(const Arch& arch)
   : ireg_file(arch.num_threads(), std::vector<Word>(arch.num_regs()))
   , freg_file(arch.num_threads(), std::vector<uint64_t>(arch.num_regs()))
+  , uuid(0)
 {}
 
 void Emulator::warp_t::clear(uint64_t startup_addr) {
@@ -153,7 +154,7 @@ instr_trace_t* Emulator::step() {
   assert(warp.tmask.any());
 
 #ifndef NDEBUG
-  uint32_t instr_uuid = warp.uui_gen.get_uuid(warp.PC);
+  uint32_t instr_uuid = warp.uuid++;
   uint32_t g_wid = core_->id() * arch_.num_warps() + scheduled_warp;
   uint64_t uuid = (uint64_t(g_wid) << 32) | instr_uuid;
 #else

sim/simx/emulator.cpp

@@ -75,7 +75,7 @@ class Emulator {
     std::vector<std::vector<uint64_t>>freg_file;
     std::stack<ipdom_entry_t>         ipdom_stack;
     Byte                              fcsr;
-    UUIDGenerator                     uui_gen;
+    uint32_t                          uuid;
   };
 
   struct wspawn_t {

sim/simx/emulator.h

@@ -22,7 +22,6 @@
 #include <stringutil.h>
 #include <VX_config.h>
 #include <simobject.h>
-#include "uuid_gen.h"
 #include "debug.h"
 
 namespace vortex {