Merge pull request #301 from firesim/misc-fixes

`rdcycle` fix for Ubuntu/Fedora + Add TracerV triggers
firesim · Apr 22, 2024 · 4f7ac3e · 4f7ac3e
2 parents 55aa37e + c15ff77
commit 4f7ac3e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 3 deletions.
diff --git a/boards/firechip/base-workloads/fedora-base.json b/boards/firechip/base-workloads/fedora-base.json
@@ -16,5 +16,10 @@
   },
   "firmware" : {
       "opensbi-src" : "../../firmware/opensbi"
-  }
+  },
+  "host-init" : "host-init.sh",
+  "files" : [
+      [ "trigger/start", "/usr/bin/firesim-start-trigger"],
+      [ "trigger/end", "/usr/bin/firesim-end-trigger"]
+  ]
 }
diff --git a/boards/firechip/base-workloads/fedora-base/host-init.sh b/boards/firechip/base-workloads/fedora-base/host-init.sh
@@ -0,0 +1 @@
+../br-base/host-init.sh
diff --git a/boards/firechip/base-workloads/fedora-base/linux-config b/boards/firechip/base-workloads/fedora-base/linux-config
@@ -61,6 +61,6 @@ CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y
+# CONFIG_RISCV_PMU is not set
 CONFIG_OVERRIDE_RNG_ENTROPY=y
 CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256
-
diff --git a/boards/firechip/base-workloads/fedora-base/trigger b/boards/firechip/base-workloads/fedora-base/trigger
@@ -0,0 +1 @@
+../br-base/trigger/
diff --git a/boards/firechip/base-workloads/ubuntu-base.json b/boards/firechip/base-workloads/ubuntu-base.json
@@ -17,5 +17,10 @@
   },
   "firmware" : {
       "opensbi-src" : "../../firmware/opensbi"
-  }
+  },
+  "host-init" : "host-init.sh",
+  "files" : [
+      [ "trigger/start", "/usr/bin/firesim-start-trigger"],
+      [ "trigger/end", "/usr/bin/firesim-end-trigger"]
+  ]
 }
diff --git a/boards/firechip/base-workloads/ubuntu-base/host-init.sh b/boards/firechip/base-workloads/ubuntu-base/host-init.sh
@@ -0,0 +1 @@
+../br-base/host-init.sh
diff --git a/boards/firechip/base-workloads/ubuntu-base/linux-config b/boards/firechip/base-workloads/ubuntu-base/linux-config
@@ -61,6 +61,7 @@ CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y
+# CONFIG_RISCV_PMU is not set
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MULTIPATH=y
 CONFIG_OVERRIDE_RNG_ENTROPY=y

diff --git a/boards/firechip/base-workloads/ubuntu-base/trigger b/boards/firechip/base-workloads/ubuntu-base/trigger
@@ -0,0 +1 @@
+../br-base/trigger/