From 51de88066612e389544017837c16aeca4b08e21f Mon Sep 17 00:00:00 2001
From: Derek Christ <christ.derek@gmail.com>
Date: Thu, 22 Feb 2024 22:29:47 +0100
Subject: [PATCH] Update configuration

---
 configs/example/gem5_library/arm-baremetal.py | 4 +---
 configs/example/gem5_library/arm-hello.py     | 7 ++++++-
 ext/dramsys/SConscript                        | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configs/example/gem5_library/arm-baremetal.py b/configs/example/gem5_library/arm-baremetal.py
index cd341f531e..945d5e0ebe 100644
--- a/configs/example/gem5_library/arm-baremetal.py
+++ b/configs/example/gem5_library/arm-baremetal.py
@@ -22,8 +22,6 @@ from gem5.components.cachehierarchies.classic.no_cache import NoCache
 cache_hierarchy = PrivateL1PrivateL2CacheHierarchy(
     l1d_size="16kB", l1i_size="16kB", l2_size="256kB"
 )
-# cache_hierarchy = NoCache()
-
 memory = DRAMSysHBM2(recordable=True)
 processor = SimpleProcessor(cpu_type=CPUTypes.O3, num_cores=1, isa=ISA.ARM)
 release = ArmDefaultRelease()
@@ -50,7 +48,7 @@ board.m5ops_base = 0x10010000
 workload = CustomWorkload(
     "set_baremetal_workload",
     {
-        "kernel": BinaryResource("pim-os"),
+        "kernel": BinaryResource("kernels/gemv"),
     },
 )
 board.set_workload(workload)
diff --git a/configs/example/gem5_library/arm-hello.py b/configs/example/gem5_library/arm-hello.py
index 0621329fee..7ed3e0117a 100644
--- a/configs/example/gem5_library/arm-hello.py
+++ b/configs/example/gem5_library/arm-hello.py
@@ -41,6 +41,11 @@ scons build/ARM/gem5.opt
 ```
 """
 
+from gem5.isas import ISA
+from gem5.utils.requires import requires
+from gem5.resources.resource import BinaryResource
+from gem5.components.memory import SingleChannelDDR3_1600
+from gem5.components.processors.cpu_types import CPUTypes
 from gem5.components.boards.simple_board import SimpleBoard
 from gem5.components.cachehierarchies.classic.no_cache import NoCache
 from gem5.components.memory import SingleChannelDDR3_1600
@@ -84,7 +89,7 @@ board.set_se_binary_workload(
     # Any resource specified in this file will be automatically retrieved.
     # At the time of writing, this file is a WIP and does not contain all
     # resources. Jira ticket: https://gem5.atlassian.net/browse/GEM5-1096
-    obtain_resource("arm-hello64-static", resource_version="1.0.0")
+    BinaryResource("physical")
 )
 
 # Lastly we run the simulation.
diff --git a/ext/dramsys/SConscript b/ext/dramsys/SConscript
index 4c5f569353..a6d3c09ee0 100644
--- a/ext/dramsys/SConscript
+++ b/ext/dramsys/SConscript
@@ -64,7 +64,7 @@ subprocess.run(
         "-DCMAKE_BUILD_TYPE=Release",
         f"-DSCONS_SOURCE_DIR:STRING={scons_root}",
         "-DDRAMSYS_BUILD_CLI=OFF",
-        "-DDRAMSYS_SHARED_PIM_UNITS=OFF"
+        "-DDRAMSYS_SHARED_PIM_UNITS=ON"
     ],
     check=True
 )