diff --git a/tests/gem5/arm_boot_tests/configs/arm_boot_exit_run.py b/tests/gem5/arm_boot_tests/configs/arm_boot_exit_run.py index 61931d1a7e..e2d496352a 100644 --- a/tests/gem5/arm_boot_tests/configs/arm_boot_exit_run.py +++ b/tests/gem5/arm_boot_tests/configs/arm_boot_exit_run.py @@ -205,14 +205,17 @@ board.set_kernel_disk_workload( kernel=obtain_resource( "arm64-linux-kernel-5.4.49", resource_directory=args.resource_directory, + resource_version="1.0.0", ), bootloader=obtain_resource( "arm64-bootloader-foundation", resource_directory=args.resource_directory, + resource_version="1.0.0", ), disk_image=obtain_resource( "arm64-ubuntu-20.04-img", resource_directory=args.resource_directory, + resource_version="1.0.0", ), ) diff --git a/tests/gem5/checkpoint_tests/configs/arm-hello-restore-checkpoint.py b/tests/gem5/checkpoint_tests/configs/arm-hello-restore-checkpoint.py index f5dfe4cfc8..de9474f444 100644 --- a/tests/gem5/checkpoint_tests/configs/arm-hello-restore-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/arm-hello-restore-checkpoint.py @@ -67,8 +67,10 @@ board = SimpleBoard( ) board.set_se_binary_workload( - obtain_resource("arm-hello64-static"), - checkpoint=obtain_resource("arm-hello-test-checkpoint"), + obtain_resource("arm-hello64-static", resource_version="1.0.0"), + checkpoint=obtain_resource( + "arm-hello-test-checkpoint", resource_version="1.0.0" + ), ) sim = Simulator(board=board, full_system=False) diff --git a/tests/gem5/checkpoint_tests/configs/arm-hello-save-checkpoint.py b/tests/gem5/checkpoint_tests/configs/arm-hello-save-checkpoint.py index 16fc2a00f0..18055d3f32 100644 --- a/tests/gem5/checkpoint_tests/configs/arm-hello-save-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/arm-hello-save-checkpoint.py @@ -63,7 +63,12 @@ board = SimpleBoard( memory=memory, cache_hierarchy=cache_hierarchy, ) -board.set_se_binary_workload(obtain_resource("arm-hello64-static")) +board.set_se_binary_workload( + obtain_resource( + "arm-hello64-static", + resource_version="1.0.0", + ) +) sim = Simulator(board=board, full_system=False) max_ticks = 10**6 diff --git a/tests/gem5/checkpoint_tests/configs/power-hello-restore-checkpoint.py b/tests/gem5/checkpoint_tests/configs/power-hello-restore-checkpoint.py index 2da1a4bcf5..6dd37bb5f7 100644 --- a/tests/gem5/checkpoint_tests/configs/power-hello-restore-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/power-hello-restore-checkpoint.py @@ -61,8 +61,10 @@ board = SimpleBoard( cache_hierarchy=cache_hierarchy, ) board.set_se_binary_workload( - obtain_resource("power-hello"), - checkpoint=obtain_resource("power-hello-test-checkpoint-v24-0"), + obtain_resource("power-hello", resource_version="1.0.0"), + checkpoint=obtain_resource( + "power-hello-test-checkpoint-v24-0", resource_version="2.0.0" + ), ) sim = Simulator(board=board, full_system=False) diff --git a/tests/gem5/checkpoint_tests/configs/power-hello-save-checkpoint.py b/tests/gem5/checkpoint_tests/configs/power-hello-save-checkpoint.py index 594d6610e0..18b5793857 100644 --- a/tests/gem5/checkpoint_tests/configs/power-hello-save-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/power-hello-save-checkpoint.py @@ -69,7 +69,9 @@ board = SimpleBoard( memory=memory, cache_hierarchy=cache_hierarchy, ) -board.set_se_binary_workload(obtain_resource("power-hello")) +board.set_se_binary_workload( + obtain_resource("power-hello", resource_version="1.0.0") +) sim = Simulator(board=board, full_system=False) max_ticks = 10**6 diff --git a/tests/gem5/checkpoint_tests/configs/sparc-hello-save-checkpoint.py b/tests/gem5/checkpoint_tests/configs/sparc-hello-save-checkpoint.py index f85ff41dbc..b7a60e39b3 100644 --- a/tests/gem5/checkpoint_tests/configs/sparc-hello-save-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/sparc-hello-save-checkpoint.py @@ -69,7 +69,12 @@ board = SimpleBoard( memory=memory, cache_hierarchy=cache_hierarchy, ) -board.set_se_binary_workload(obtain_resource("sparc-hello")) +board.set_se_binary_workload( + obtain_resource( + "sparc-hello", + resource_version="1.0.0", + ) +) sim = Simulator(board=board, full_system=False) max_ticks = 10**6 diff --git a/tests/gem5/checkpoint_tests/configs/x86-fs-restore-checkpoint.py b/tests/gem5/checkpoint_tests/configs/x86-fs-restore-checkpoint.py index 7fb9a483ff..6bd79fe588 100644 --- a/tests/gem5/checkpoint_tests/configs/x86-fs-restore-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/x86-fs-restore-checkpoint.py @@ -74,9 +74,15 @@ board = X86Board( # Set the Full System workload. board.set_kernel_disk_workload( - kernel=obtain_resource("x86-linux-kernel-5.4.49"), - disk_image=obtain_resource("x86-ubuntu-18.04-img"), - checkpoint=obtain_resource("x86-fs-test-checkpoint-v24-0"), + kernel=obtain_resource( + "x86-linux-kernel-5.4.49", resource_version="1.0.0" + ), + disk_image=obtain_resource( + "x86-ubuntu-18.04-img", resource_version="1.0.0" + ), + checkpoint=obtain_resource( + "x86-fs-test-checkpoint-v24-0", resource_version="2.0.0" + ), ) sim = Simulator(board=board, full_system=True) diff --git a/tests/gem5/checkpoint_tests/configs/x86-hello-restore-checkpoint.py b/tests/gem5/checkpoint_tests/configs/x86-hello-restore-checkpoint.py index 5bdeb4df50..5175d0bb4b 100644 --- a/tests/gem5/checkpoint_tests/configs/x86-hello-restore-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/x86-hello-restore-checkpoint.py @@ -61,8 +61,13 @@ board = SimpleBoard( cache_hierarchy=cache_hierarchy, ) board.set_se_binary_workload( - obtain_resource("x86-hello64-static"), - checkpoint=obtain_resource("x86-hello-test-checkpoint-v24-0"), + obtain_resource( + "x86-hello64-static", + resource_version="1.0.0", + ), + checkpoint=obtain_resource( + "x86-hello-test-checkpoint-v24-0", resource_version="2.0.0" + ), ) sim = Simulator(board=board, full_system=False) diff --git a/tests/gem5/checkpoint_tests/configs/x86-hello-save-checkpoint.py b/tests/gem5/checkpoint_tests/configs/x86-hello-save-checkpoint.py index bc35e581df..111ddafbe5 100644 --- a/tests/gem5/checkpoint_tests/configs/x86-hello-save-checkpoint.py +++ b/tests/gem5/checkpoint_tests/configs/x86-hello-save-checkpoint.py @@ -69,7 +69,12 @@ board = SimpleBoard( memory=memory, cache_hierarchy=cache_hierarchy, ) -board.set_se_binary_workload(obtain_resource("x86-hello64-static")) +board.set_se_binary_workload( + obtain_resource( + "x86-hello64-static", + resource_version="1.0.0", + ) +) sim = Simulator(board=board, full_system=False) max_ticks = 10**6 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 3dc6119454..a415dbd458 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 @@ -180,10 +180,14 @@ kernel_args = motherboard.get_default_kernel_args() + [args.kernel_args] # Set the Full System workload. motherboard.set_kernel_disk_workload( kernel=obtain_resource( - "x86-linux-kernel-5.4.49", resource_directory=args.resource_directory + "x86-linux-kernel-5.4.49", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), disk_image=obtain_resource( - "x86-ubuntu-18.04-img", resource_directory=args.resource_directory + "x86-ubuntu-18.04-img", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), readfile_contents=dedent( """ 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 c5b59b7f4e..5d42a52142 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 @@ -166,10 +166,14 @@ kernal_args = motherboard.get_default_kernel_args() + [args.kernel_args] # Set the Full System workload. motherboard.set_kernel_disk_workload( kernel=obtain_resource( - "x86-linux-kernel-5.4.49", resource_directory=args.resource_directory + "x86-linux-kernel-5.4.49", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), disk_image=obtain_resource( - "x86-ubuntu-18.04-img", resource_directory=args.resource_directory + "x86-ubuntu-18.04-img", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), # The first exit signals to switch processors. readfile_contents="m5 exit\nm5 exit\n", diff --git a/tests/gem5/parsec_benchmarks/configs/parsec_disk_run.py b/tests/gem5/parsec_benchmarks/configs/parsec_disk_run.py index 5a9d5e6e47..91b30e5fa2 100644 --- a/tests/gem5/parsec_benchmarks/configs/parsec_disk_run.py +++ b/tests/gem5/parsec_benchmarks/configs/parsec_disk_run.py @@ -204,10 +204,14 @@ command = ( board.set_kernel_disk_workload( kernel=obtain_resource( - "x86-linux-kernel-5.4.49", resource_directory=args.resource_directory + "x86-linux-kernel-5.4.49", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), disk_image=obtain_resource( - "x86-parsec", resource_directory=args.resource_directory + "x86-parsec", + resource_directory=args.resource_directory, + resource_version="1.0.0", ), readfile_contents=command, ) diff --git a/tests/gem5/riscv_boot_tests/configs/riscv_boot_exit_run.py b/tests/gem5/riscv_boot_tests/configs/riscv_boot_exit_run.py index 5dfc082e66..d04d5aa5f0 100644 --- a/tests/gem5/riscv_boot_tests/configs/riscv_boot_exit_run.py +++ b/tests/gem5/riscv_boot_tests/configs/riscv_boot_exit_run.py @@ -163,7 +163,9 @@ board = RiscvBoard( # Set the workload. workload = obtain_resource( - "riscv-ubuntu-20.04-boot", resource_directory=args.resource_directory + "riscv-ubuntu-20.04-boot", + resource_directory=args.resource_directory, + resource_version="3.0.0", ) board.set_workload(workload) diff --git a/tests/gem5/stdlib/configs/simulator_exit_event_run.py b/tests/gem5/stdlib/configs/simulator_exit_event_run.py index 6b5e06890f..9338e1233b 100644 --- a/tests/gem5/stdlib/configs/simulator_exit_event_run.py +++ b/tests/gem5/stdlib/configs/simulator_exit_event_run.py @@ -103,7 +103,9 @@ motherboard = SimpleBoard( # Note: Here we're using the "x86-m5-exit-repeat" resource. This calls an # `m5_exit(0)` command in an infinite while-loop. binary = obtain_resource( - "x86-m5-exit-repeat", resource_directory=args.resource_directory + "x86-m5-exit-repeat", + resource_directory=args.resource_directory, + resource_version="1.0.0", ) motherboard.set_se_binary_workload(binary) diff --git a/tests/gem5/suite_tests/test_suite.py b/tests/gem5/suite_tests/test_suite.py index c86885f37e..04cca71669 100644 --- a/tests/gem5/suite_tests/test_suite.py +++ b/tests/gem5/suite_tests/test_suite.py @@ -97,6 +97,7 @@ test_suite( isa="riscv", to_tick=10000000000, is_fs=False, + version="1.0.0", ) test_suite( @@ -104,6 +105,7 @@ test_suite( isa="x86", to_tick=10000000000, is_fs=True, + version="1.0.0", ) test_suite( @@ -111,4 +113,5 @@ test_suite( isa="x86", to_tick=10000000000, is_fs=True, + version="1.0.0", ) diff --git a/tests/gem5/to_tick/configs/tick-exit.py b/tests/gem5/to_tick/configs/tick-exit.py index b1da983abd..e2b6d6809f 100644 --- a/tests/gem5/to_tick/configs/tick-exit.py +++ b/tests/gem5/to_tick/configs/tick-exit.py @@ -77,7 +77,9 @@ motherboard = SimpleBoard( # Set the workload binary = obtain_resource( - "x86-hello64-static", resource_directory=args.resource_directory + "x86-hello64-static", + resource_directory=args.resource_directory, + resource_version="1.0.0", ) motherboard.set_se_binary_workload(binary) diff --git a/tests/gem5/to_tick/configs/tick-to-max.py b/tests/gem5/to_tick/configs/tick-to-max.py index 25e0014211..ea99d90eda 100644 --- a/tests/gem5/to_tick/configs/tick-to-max.py +++ b/tests/gem5/to_tick/configs/tick-to-max.py @@ -98,7 +98,9 @@ motherboard = SimpleBoard( # Set the workload binary = obtain_resource( - "x86-hello64-static", resource_directory=args.resource_directory + "x86-hello64-static", + resource_directory=args.resource_directory, + resource_version="1.0.0", ) motherboard.set_se_binary_workload(binary) diff --git a/tests/gem5/x86_boot_tests/configs/x86_boot_exit_run.py b/tests/gem5/x86_boot_tests/configs/x86_boot_exit_run.py index 3a91c4d253..7ad8682754 100644 --- a/tests/gem5/x86_boot_tests/configs/x86_boot_exit_run.py +++ b/tests/gem5/x86_boot_tests/configs/x86_boot_exit_run.py @@ -184,7 +184,9 @@ if args.boot_type == "init": # Set the workload. workload = obtain_resource( - "x86-ubuntu-18.04-boot", resource_directory=args.resource_directory + "x86-ubuntu-18.04-boot", + resource_directory=args.resource_directory, + resource_version="2.0.0", ) workload.set_parameter("kernel_args", kernal_args) motherboard.set_workload(workload)