diff --git a/tests/gem5/arm_boot_tests/test_linux_boot.py b/tests/gem5/arm_boot_tests/test_linux_boot.py index 77b519552d..43f18da239 100644 --- a/tests/gem5/arm_boot_tests/test_linux_boot.py +++ b/tests/gem5/arm_boot_tests/test_linux_boot.py @@ -87,7 +87,6 @@ arm_boot_test" valid_isas=(constants.all_compiled_tag,), valid_hosts=constants.supported_hosts, length=length, - protocol=None, ) diff --git a/tests/gem5/chi_protocol/test_chi_per_isa.py b/tests/gem5/chi_protocol/test_chi_per_isa.py index e44ace5f91..5ac4a05e15 100644 --- a/tests/gem5/chi_protocol/test_chi_per_isa.py +++ b/tests/gem5/chi_protocol/test_chi_per_isa.py @@ -72,6 +72,5 @@ for isa in ("arm", "riscv", "x86"): ], valid_isas=(constants.all_compiled_tag,), valid_hosts=constants.supported_hosts, - protocol=None, length=constants.long_tag, ) diff --git a/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py b/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py index eba2d101e2..2b45cc4dba 100644 --- a/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py +++ b/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py @@ -196,7 +196,6 @@ if False: # os.access("/dev/kvm", mode=os.R_OK | os.W_OK): ), config_args=["--benchmark", "blackscholes", "--size", "simsmall"], valid_isas=(constants.all_compiled_tag,), - protocol=None, valid_hosts=(constants.host_x86_64_tag,), length=constants.long_tag, uses_kvm=True, @@ -223,7 +222,6 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK): "5000000000", ], valid_isas=(constants.all_compiled_tag,), - protocol=None, valid_hosts=(constants.host_x86_64_tag,), length=constants.long_tag, uses_kvm=True, @@ -245,7 +243,6 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK): ), config_args=["--benchmark", "gapbs-bfs-test"], valid_isas=(constants.all_compiled_tag,), - protocol=None, valid_hosts=(constants.host_x86_64_tag,), length=constants.long_tag, uses_kvm=True, diff --git a/tests/gem5/kvm_fork_tests/configs/boot_kvm_fork_run.py b/tests/gem5/kvm_fork_tests/configs/boot_kvm_fork_run.py index bc0d55edaf..59c1655fad 100644 --- a/tests/gem5/kvm_fork_tests/configs/boot_kvm_fork_run.py +++ b/tests/gem5/kvm_fork_tests/configs/boot_kvm_fork_run.py @@ -56,10 +56,6 @@ from gem5.components.processors.simple_switchable_processor import ( ) from gem5.isas import ISA from gem5.resources.resource import obtain_resource - -# This function was removed in the change to compile all Ruby protocols in one -# build -# from gem5.runtime import get_runtime_coherence_protocol from gem5.utils.requires import requires parser = argparse.ArgumentParser( @@ -207,8 +203,9 @@ motherboard.set_kernel_disk_workload( # Begin running of the simulation. This will exit once the Linux system boot # is complete. print("Running with ISA: " + processor.get_isa().name) -# This function was removed -# print("Running with protocol: " + get_runtime_coherence_protocol().name) +print( + "Running with protocol: " + cache_hierarchy.get_coherence_protocol().name +) print() # Disable the gdb ports. Required for forking. diff --git a/tests/gem5/kvm_fork_tests/test_kvm_fork_run.py b/tests/gem5/kvm_fork_tests/test_kvm_fork_run.py index 462ee3fd9b..69059b2020 100644 --- a/tests/gem5/kvm_fork_tests/test_kvm_fork_run.py +++ b/tests/gem5/kvm_fork_tests/test_kvm_fork_run.py @@ -75,7 +75,6 @@ def test_kvm_fork_run(cpu: str, num_cpus: int, mem_system: str, length: str): ], valid_isas=(constants.all_compiled_tag,), valid_hosts=(constants.host_x86_64_tag,), - protocol=None, length=length, uses_kvm=True, ) diff --git a/tests/gem5/kvm_switch_tests/configs/boot_kvm_switch_exit.py b/tests/gem5/kvm_switch_tests/configs/boot_kvm_switch_exit.py index 4d6da7b5f4..1f9e877bc1 100644 --- a/tests/gem5/kvm_switch_tests/configs/boot_kvm_switch_exit.py +++ b/tests/gem5/kvm_switch_tests/configs/boot_kvm_switch_exit.py @@ -46,10 +46,6 @@ from gem5.components.processors.simple_switchable_processor import ( ) from gem5.isas import ISA from gem5.resources.resource import obtain_resource - -# This function was removed in the change to compile all Ruby protocols in one -# build -# from gem5.runtime import get_runtime_coherence_protocol from gem5.simulate.exit_event import ExitEvent from gem5.simulate.simulator import Simulator from gem5.utils.requires import requires @@ -189,8 +185,9 @@ motherboard.set_kernel_disk_workload( # Begin running of the simulation. This will exit once the Linux system boot # is complete. print("Running with ISA: " + processor.get_isa().name) -# This function was removed -# print("Running with protocol: " + get_runtime_coherence_protocol().name) +print( + "Running with protocol: " + cache_hierarchy.get_coherence_protocol().name +) print() simulator = Simulator( diff --git a/tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py b/tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py index e8530c3d6c..a2d3b9c7d3 100644 --- a/tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py +++ b/tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py @@ -73,7 +73,6 @@ def test_kvm_switch(cpu: str, num_cpus: int, mem_system: str, length: str): ], valid_isas=(constants.all_compiled_tag,), valid_hosts=(constants.host_x86_64_tag,), - protocol=None, length=length, uses_kvm=True, ) diff --git a/tests/gem5/x86_boot_tests/test_linux_boot.py b/tests/gem5/x86_boot_tests/test_linux_boot.py index 4816457391..534c5ff034 100644 --- a/tests/gem5/x86_boot_tests/test_linux_boot.py +++ b/tests/gem5/x86_boot_tests/test_linux_boot.py @@ -88,7 +88,6 @@ def test_boot( + additional_config_args, valid_isas=(constants.all_compiled_tag,), valid_hosts=constants.supported_hosts, - protocol=None, length=length, )