tests: remove protocol=None, add print statement back in

This commit removes the `protocol=None` argument in various
gem5_verify_config()s because protocol is set to None by
default. Also, two print statements that were taken out in
previous commits were put back in with different function calls.

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,
     )
 
 

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,
         )

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,

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.

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,
     )

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(

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,
     )

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,
     )