From d9efde7a44875fbe829ccd4ffae3d75fac0c8eee Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Fri, 2 Aug 2024 12:08:03 +0800
Subject: [PATCH] npc: add cmake-format for verilate macro

---
 npc/.cmake-format                    | 24 +++++++++++++++++
 npc/.gdbinit                         |  2 +-
 npc/core/project/plugin.sbt          |  1 -
 npc/csrc/Flow/CMakeLists.txt         | 40 +++++++++-------------------
 npc/csrc_nvboard/Flow/CMakeLists.txt | 15 ++++-------
 5 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 npc/.cmake-format
 delete mode 100644 npc/core/project/plugin.sbt

diff --git a/npc/.cmake-format b/npc/.cmake-format
new file mode 100644
index 0000000..d98e985
--- /dev/null
+++ b/npc/.cmake-format
@@ -0,0 +1,24 @@
+additional_commands = {
+  "verilate": {
+    "pargs": 1,
+    "flags": [
+        "COVERAGE",
+        "SYSTEMC",
+        "THREADS",
+        "TRACE_THREADS",
+        "TRACE",
+        "TRACE_FST"
+    ],
+    "kwargs": {
+        "DIRECTORY": "?",
+        "INCLUDE_DIRS": "*",
+        "OPT_SLOW": "*",
+        "OPT_FAST": "*",
+        "OPT_GLOBAL": "*",
+        "PREFIX": "?",
+        "SOURCES": "+",
+        "TOP_MODULE": "?",
+        "VERILATOR_ARGS": "*",
+    }
+  }
+}
diff --git a/npc/.gdbinit b/npc/.gdbinit
index 6549aeb..59ce952 100644
--- a/npc/.gdbinit
+++ b/npc/.gdbinit
@@ -1,3 +1,3 @@
 set substitute-path /build/am-kernels /home/xin/repo/ysyx-workbench/am-kernels
 file /nix/store/g8hi9rlby6xm7grzcpfc8lpmdfgv1i92-am-kernel-riscv32-none-elf-2024-07-10/libexec/am-kernels/add
-target remote /tmp/gdbstub-npc.sock
+target remote gdbstub-npc.sock
diff --git a/npc/core/project/plugin.sbt b/npc/core/project/plugin.sbt
deleted file mode 100644
index 0c0f704..0000000
--- a/npc/core/project/plugin.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.2")
diff --git a/npc/csrc/Flow/CMakeLists.txt b/npc/csrc/Flow/CMakeLists.txt
index 2af6a5b..a322d0e 100644
--- a/npc/csrc/Flow/CMakeLists.txt
+++ b/npc/csrc/Flow/CMakeLists.txt
@@ -5,20 +5,12 @@ target_include_directories(V${TOPMODULE} PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
 verilate(
   V${TOPMODULE}
-  TRACE
-  THREADS
-  TOP_MODULE
-  ${TOPMODULE}
-  PREFIX
-  V${TOPMODULE}
-  SOURCES
-  ${CHISEL_OUTPUT_TOPMODULE}
-  ${CHISEL_OUTPUT_VERILATOR_CONF}
-  INCLUDE_DIRS
-  ${CHISEL_OUTPUT_DIR}
-  VERILATOR_ARGS
-  "--vpi" # Enable VPI
-  "-Wno-UNOPTFLAT")
+  TRACE THREADS
+  TOP_MODULE ${TOPMODULE}
+  PREFIX V${TOPMODULE}
+  SOURCES ${CHISEL_OUTPUT_TOPMODULE} ${CHISEL_OUTPUT_VERILATOR_CONF}
+  INCLUDE_DIRS ${CHISEL_OUTPUT_DIR}
+  VERILATOR_ARGS "--vpi" "-Wno-UNOPTFLAT")
 
 foreach(DIFFTEST_BINARY_FILE IN LISTS DIFFTEST_BINARY_FILES)
   get_filename_component(FILENAME ${DIFFTEST_BINARY_FILE} NAME_WE)
@@ -36,17 +28,9 @@ target_link_options(${TOPMODULE} PRIVATE -Wl,-E)
 
 verilate(
   ${TOPMODULE}
-  TRACE
-  THREADS
-  TOP_MODULE
-  ${TOPMODULE}
-  PREFIX
-  V${TOPMODULE}
-  SOURCES
-  ${CHISEL_OUTPUT_TOPMODULE}
-  ${CHISEL_OUTPUT_VERILATOR_CONF}
-  INCLUDE_DIRS
-  ${CHISEL_OUTPUT_DIR}
-  VERILATOR_ARGS
-  "--vpi" # Enable VPI
-  "-Wno-UNOPTFLAT")
+  TRACE THREADS
+  TOP_MODULE ${TOPMODULE}
+  PREFIX V${TOPMODULE}
+  SOURCES ${CHISEL_OUTPUT_TOPMODULE} ${CHISEL_OUTPUT_VERILATOR_CONF}
+  INCLUDE_DIRS ${CHISEL_OUTPUT_DIR}
+  VERILATOR_ARGS "--vpi" "-Wno-UNOPTFLAT")
diff --git a/npc/csrc_nvboard/Flow/CMakeLists.txt b/npc/csrc_nvboard/Flow/CMakeLists.txt
index 6e3e1b3..90e8add 100644
--- a/npc/csrc_nvboard/Flow/CMakeLists.txt
+++ b/npc/csrc_nvboard/Flow/CMakeLists.txt
@@ -11,16 +11,11 @@ add_executable(V${TOPMODULE}_nvboard
 
 verilate(
   V${TOPMODULE}_nvboard
-  TRACE
-  THREADS
-  TOP_MODULE
-  ${TOPMODULE}
-  PREFIX
-  V${TOPMODULE}
-  SOURCES
-  ${CHISEL_OUTPUT_TOPMODULE}
-  INCLUDE_DIRS
-  ${CHISEL_OUTPUT_DIR})
+  TRACE THREADS
+  TOP_MODULE ${TOPMODULE}
+  PREFIX V${TOPMODULE}
+  SOURCES ${CHISEL_OUTPUT_TOPMODULE}
+  INCLUDE_DIRS ${CHISEL_OUTPUT_DIR})
 
 target_include_directories(V${TOPMODULE}_nvboard PRIVATE ${NVBOARD_INCLUDE_DIR}
                                                          ${SDL2_INCLUDE_DIRS})