From 391f62b2130285f096239e555541576502e5695d Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 31 Aug 2023 10:26:45 -0700 Subject: [PATCH] misc: 'sim{out/err}' -> 'sim{out/err}.txt' By default, the --stderr-file and --stdout-file arguments were directing the simulator output to files named "simerr" and "simout" respectively if an output redirect was requested. A small annoyance is these files lack an extension meaning programs refuse to open them, or to do so without some additional effort. On many systems they are assumed to scripts. This patch adds the .txt extension to both, thus clearly indicating to other programs these are text files and can be opened to be read as such. Change-Id: Iff5af4a9e6966b4467d005a029dbf401099fbd35 --- ext/testlib/configuration.py | 4 ++-- src/python/m5/main.py | 4 ++-- src/systemc/tests/verify.py | 2 +- tests/gem5/dram_lowp/ref/{simout => simout.txt} | 0 tests/gem5/dram_lowp/test_dram_lowp.py | 4 +++- tests/gem5/insttest_se/ref/{simout => simout.txt} | 0 tests/gem5/insttest_se/test.py | 4 +++- .../ref/sparc64/{simout => simout.txt} | 0 tests/gem5/m5threads_test_atomic/test.py | 2 +- tests/gem5/stdlib/simulator/ref/{simout => simout.txt} | 0 tests/gem5/stdlib/simulator/test_event_event.py | 4 +++- tests/gem5/verifier.py | 2 +- util/plot_dram/dram_lat_mem_rd_plot.py | 8 ++++---- util/plot_dram/dram_sweep_plot.py | 8 +++++--- 14 files changed, 25 insertions(+), 17 deletions(-) rename tests/gem5/dram_lowp/ref/{simout => simout.txt} (100%) rename tests/gem5/insttest_se/ref/{simout => simout.txt} (100%) rename tests/gem5/m5threads_test_atomic/ref/sparc64/{simout => simout.txt} (100%) rename tests/gem5/stdlib/simulator/ref/{simout => simout.txt} (100%) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 600f0e13cc..f4d4d42440 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -318,8 +318,8 @@ def define_constants(constants): constants.supported_hosts = constants.supported_tags["host"] constants.tempdir_fixture_name = "tempdir" - constants.gem5_simulation_stderr = "simerr" - constants.gem5_simulation_stdout = "simout" + constants.gem5_simulation_stderr = "simerr.txt" + constants.gem5_simulation_stdout = "simout.txt" constants.gem5_simulation_stats = "stats.txt" constants.gem5_simulation_config_ini = "config.ini" constants.gem5_simulation_config_json = "config.json" diff --git a/src/python/m5/main.py b/src/python/m5/main.py index e07e9562ab..20dd7caad6 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -126,13 +126,13 @@ def parse_options(): option( "--stdout-file", metavar="FILE", - default="simout", + default="simout.txt", help="Filename for -r redirection [Default: %default]", ) option( "--stderr-file", metavar="FILE", - default="simerr", + default="simerr.txt", help="Filename for -e redirection [Default: %default]", ) option( diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py index c0e072e3c2..acd9cb15e8 100755 --- a/src/systemc/tests/verify.py +++ b/src/systemc/tests/verify.py @@ -508,7 +508,7 @@ class VerifyPhase(TestPhaseBase): missing = [] log_file = ".".join([test.name, "log"]) log_path = gd.entry(log_file) - simout_path = os.path.join(out_dir, "simout") + simout_path = os.path.join(out_dir, "simout.txt") if not os.path.exists(simout_path): missing.append("log output") elif log_path: diff --git a/tests/gem5/dram_lowp/ref/simout b/tests/gem5/dram_lowp/ref/simout.txt similarity index 100% rename from tests/gem5/dram_lowp/ref/simout rename to tests/gem5/dram_lowp/ref/simout.txt diff --git a/tests/gem5/dram_lowp/test_dram_lowp.py b/tests/gem5/dram_lowp/test_dram_lowp.py index 2e146bbe46..ec38acacc1 100644 --- a/tests/gem5/dram_lowp/test_dram_lowp.py +++ b/tests/gem5/dram_lowp/test_dram_lowp.py @@ -26,7 +26,9 @@ from testlib import * -verifiers = (verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref", "simout")),) +verifiers = ( + verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref", "simout.txt")), +) gem5_verify_config( name="test-low_power-close_adaptive", diff --git a/tests/gem5/insttest_se/ref/simout b/tests/gem5/insttest_se/ref/simout.txt similarity index 100% rename from tests/gem5/insttest_se/ref/simout rename to tests/gem5/insttest_se/ref/simout.txt diff --git a/tests/gem5/insttest_se/test.py b/tests/gem5/insttest_se/test.py index a9991b7102..bf59382b52 100644 --- a/tests/gem5/insttest_se/test.py +++ b/tests/gem5/insttest_se/test.py @@ -41,7 +41,9 @@ else: for isa in test_progs: for binary in test_progs[isa]: ref_path = joinpath(getcwd(), "ref") - verifiers = (verifier.MatchStdoutNoPerf(joinpath(ref_path, "simout")),) + verifiers = ( + verifier.MatchStdoutNoPerf(joinpath(ref_path, "simout.txt")), + ) for cpu in cpu_types[isa]: gem5_verify_config( diff --git a/tests/gem5/m5threads_test_atomic/ref/sparc64/simout b/tests/gem5/m5threads_test_atomic/ref/sparc64/simout.txt similarity index 100% rename from tests/gem5/m5threads_test_atomic/ref/sparc64/simout rename to tests/gem5/m5threads_test_atomic/ref/sparc64/simout.txt diff --git a/tests/gem5/m5threads_test_atomic/test.py b/tests/gem5/m5threads_test_atomic/test.py index 531de83b2f..0af973bd14 100644 --- a/tests/gem5/m5threads_test_atomic/test.py +++ b/tests/gem5/m5threads_test_atomic/test.py @@ -45,7 +45,7 @@ url = config.resource_url + "/test-progs/pthreads/sparc64/" + binary test_atomic = DownloadedProgram(url, base_path, binary) verifiers = ( - verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref/sparc64/simout")), + verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref/sparc64/simout.txt")), ) for cpu in cpu_types: diff --git a/tests/gem5/stdlib/simulator/ref/simout b/tests/gem5/stdlib/simulator/ref/simout.txt similarity index 100% rename from tests/gem5/stdlib/simulator/ref/simout rename to tests/gem5/stdlib/simulator/ref/simout.txt diff --git a/tests/gem5/stdlib/simulator/test_event_event.py b/tests/gem5/stdlib/simulator/test_event_event.py index ed755c2e36..23204f0026 100644 --- a/tests/gem5/stdlib/simulator/test_event_event.py +++ b/tests/gem5/stdlib/simulator/test_event_event.py @@ -32,7 +32,9 @@ tests/gem5/configs/simple_binary_run.py to run a simple SE-mode simualation with different configurations of the BaseCPUProcessor. """ -verifiers = (verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref", "simout")),) +verifiers = ( + verifier.MatchStdoutNoPerf(joinpath(getcwd(), "ref", "simout.txt")), +) gem5_verify_config( diff --git a/tests/gem5/verifier.py b/tests/gem5/verifier.py index c725fc68b9..9bc5e8f8b5 100644 --- a/tests/gem5/verifier.py +++ b/tests/gem5/verifier.py @@ -84,7 +84,7 @@ class MatchGoldStandard(Verifier): """ def __init__( - self, standard_filename, ignore_regex=None, test_filename="simout" + self, standard_filename, ignore_regex=None, test_filename="simout.txt" ): """ :param standard_filename: The path of the standard file to compare diff --git a/util/plot_dram/dram_lat_mem_rd_plot.py b/util/plot_dram/dram_lat_mem_rd_plot.py index 0d0e8d052b..541fa9808c 100755 --- a/util/plot_dram/dram_lat_mem_rd_plot.py +++ b/util/plot_dram/dram_lat_mem_rd_plot.py @@ -47,7 +47,7 @@ import sys import re # This script is intended to post process and plot the output from -# running configs/dram/lat_mem_rd.py, as such it parses the simout and +# running configs/dram/lat_mem_rd.py, as such it parses the simout.txt and # stats.txt to get the relevant data points. def main(): @@ -62,9 +62,9 @@ def main(): exit(-1) try: - simout = open(sys.argv[1] + "/simout", "r") + simout = open(sys.argv[1] + "/simout.txt", "r") except IOError: - print("Failed to open ", sys.argv[1] + "/simout", " for reading") + print("Failed to open ", sys.argv[1] + "/simout.txt", " for reading") exit(-1) # Get the address ranges @@ -85,7 +85,7 @@ def main(): simout.close() if not got_ranges: - print("Failed to get address ranges, ensure simout is up-to-date") + print("Failed to get address ranges, ensure simout.txt is up-to-date") exit(-1) # Now parse the stats diff --git a/util/plot_dram/dram_sweep_plot.py b/util/plot_dram/dram_sweep_plot.py index 1350f7af77..89c0dda7da 100755 --- a/util/plot_dram/dram_sweep_plot.py +++ b/util/plot_dram/dram_sweep_plot.py @@ -79,9 +79,9 @@ def main(): exit(-1) try: - simout = open(sys.argv[2] + "/simout", "r") + simout = open(sys.argv[2] + "/simout.txt", "r") except IOError: - print("Failed to open ", sys.argv[2] + "/simout", " for reading") + print("Failed to open ", sys.argv[2] + "/simout.txt", " for reading") exit(-1) # Get the burst size, number of banks and the maximum stride from @@ -102,7 +102,9 @@ def main(): simout.close() if not got_sweep: - print("Failed to establish sweep details, ensure simout is up-to-date") + print( + "Failed to establish sweep details, ensure simout.txt is up-to-date" + ) exit(-1) # Now parse the stats