From 7adaaa6f2a2a1bfc7c243205a406a8f5fe695e87 Mon Sep 17 00:00:00 2001 From: Jason Lowe-Power Date: Wed, 20 Dec 2023 15:25:17 -0800 Subject: [PATCH] mem-ruby,configs: Enable Ruby with NULL build After removing `get_runtime_isa`, the `send_evicts` function in the ruby configs assumes that there is an ISA built. This change short-circuits that logic if the current build is the NULL (none) ISA. Change-Id: I75fefe3d70649b636b983c4d2145c63a9e1342f7 Signed-off-by: Jason Lowe-Power --- configs/ruby/Ruby.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index b84a69a80f..e427a39de8 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -48,6 +48,7 @@ from m5.util import ( ) from gem5.isas import ISA +from gem5.runtime import get_supported_isas addToPath("../") @@ -330,6 +331,8 @@ def send_evicts(options): # 1. The O3 model must keep the LSQ coherent with the caches # 2. The x86 mwait instruction is built on top of coherence invalidations # 3. The local exclusive monitor in ARM systems + if get_supported_isas() == {ISA.NULL}: + return False if ( hasattr(m5.objects, "DerivO3CPU")