Commit 8d39b02f authored by firm's avatar firm
Browse files

Fixed a few warnings due to auto-generated fields

Also added platform defines for 600.perlbench, but they aren't passed on yet.
parent 691319d5
...@@ -167,6 +167,7 @@ i686_flags = dict() ...@@ -167,6 +167,7 @@ i686_flags = dict()
i686_flags["186.crafty"] = "-DLINUX_i386" i686_flags["186.crafty"] = "-DLINUX_i386"
i686_flags["253.perlbmk"] = "-DSPEC_CPU2000_LINUX_I386" i686_flags["253.perlbmk"] = "-DSPEC_CPU2000_LINUX_I386"
i686_flags["400.perlbench"] = "-DSPEC_CPU_LINUX_IA32" i686_flags["400.perlbench"] = "-DSPEC_CPU_LINUX_IA32"
i686_flags["600.perlbench"] = "-DSPEC_LINUX_IA32"
TARGET_ARCH_FLAGS["i686"] = i686_flags TARGET_ARCH_FLAGS["i686"] = i686_flags
x86_64_flags = defaultdict(str) x86_64_flags = defaultdict(str)
...@@ -176,6 +177,7 @@ x86_64_flags["253.perlbmk"] = "-DSPEC_CPU2000_LP64 -DHAS_LONG_LONG -DSPEC_CPU200 ...@@ -176,6 +177,7 @@ x86_64_flags["253.perlbmk"] = "-DSPEC_CPU2000_LP64 -DHAS_LONG_LONG -DSPEC_CPU200
x86_64_flags["254.gap"] = "-DSPEC_CPU2000_LP64" x86_64_flags["254.gap"] = "-DSPEC_CPU2000_LP64"
x86_64_flags["255.vortex"] = "-DSPEC_CPU2000_LP64" x86_64_flags["255.vortex"] = "-DSPEC_CPU2000_LP64"
x86_64_flags["400.perlbench"] = "-DSPEC_CPU_LINUX_X64" x86_64_flags["400.perlbench"] = "-DSPEC_CPU_LINUX_X64"
x86_64_flags["600.perlbench"] = "-DSPEC_LINUX_IA64"
for bench in ["400.perlbench", "403.gcc", "436.cactusADM", "453.povray", for bench in ["400.perlbench", "403.gcc", "436.cactusADM", "453.povray",
"481.wrf"]: "481.wrf"]:
x86_64_flags[bench] += " -DSPEC_CPU_LP64" x86_64_flags[bench] += " -DSPEC_CPU_LP64"
...@@ -412,26 +414,27 @@ def generate_spec_config(options, progs): ...@@ -412,26 +414,27 @@ def generate_spec_config(options, progs):
if SPEC_SUITE != "SPEC CPU2017": if SPEC_SUITE != "SPEC CPU2017":
contents.append("tester_name = IPD Snelting") contents.append("tester_name = IPD Snelting")
contents.append("company_name = Karlsruhe Institute of Technology KIT") contents.append("company_name = Karlsruhe Institute of Technology KIT")
contents.append("prepared_by = spec.py script") contents.append("prepared_by = spec.py script")
contents.append("") contents.append("")
contents.append("## just assuming:") contents.append("## just assuming:")
if SPEC_SUITE != "SPEC CPU2017": if SPEC_SUITE != "SPEC CPU2017":
contents.append("hw_fpu = Integrated") contents.append("hw_fpu = Integrated")
contents.append("sw_state = Multi-user") contents.append("sw_state = Multi-user")
if options.build_only: if options.build_only:
contents.append("action = build") contents.append("action = build")
else: else:
contents.append("action = validate") # includes run contents.append("action = validate") # includes run
contents.append("runlist = %s" % (" ".join(progs))) contents.append("runlist = %s" % (" ".join(progs)))
contents.append("iterations = %d" % int(options.iterations)) contents.append("iterations = %d" % int(options.iterations))
if SPEC_SUITE != "SPEC CPU2006": if SPEC_SUITE != "SPEC CPU2006" and SPEC_SUITE != "SPEC CPU2017":
contents.append("test_date = %s" % datetime.now()) contents.append("test_date = %s" % datetime.now())
contents.append("") contents.append("")
contents.append("sw_os = %s %s %s" % (LINUX_NAME, LINUX_VERSION, LINUX_CODENAME)) contents.append("sw_os = %s %s %s" % (LINUX_NAME, LINUX_VERSION, LINUX_CODENAME))
contents.append("sw_compiler1 = %s" % get_compiler_version(options.c_compiler)) contents.append("sw_compiler1 = %s" % get_compiler_version(options.c_compiler))
contents.append("sw_compiler2 = %s" % get_compiler_version(options.cpp_compiler)) contents.append("sw_compiler2 = %s" % get_compiler_version(options.cpp_compiler))
contents.append("sw_compiler3 = %s" % get_compiler_version(options.fortran_compiler)) contents.append("sw_compiler3 = %s" % get_compiler_version(options.fortran_compiler))
contents.append("sw_file = %s" % path_to_filesystem(".")) if SPEC_SUITE != "SPEC CPU2017":
contents.append("sw_file = %s" % path_to_filesystem("."))
assert int(BITSIZE), "bitsize is "+BITSIZE assert int(BITSIZE), "bitsize is "+BITSIZE
contents.append("sw_base_ptrsize = %d-bit" % BITSIZE) contents.append("sw_base_ptrsize = %d-bit" % BITSIZE)
contents.append("sw_peak_ptrsize = %d-bit" % BITSIZE) contents.append("sw_peak_ptrsize = %d-bit" % BITSIZE)
...@@ -447,7 +450,7 @@ def generate_spec_config(options, progs): ...@@ -447,7 +450,7 @@ def generate_spec_config(options, progs):
contents.append("hw_ncpu = %d" % cores) contents.append("hw_ncpu = %d" % cores)
if SPEC_SUITE != "SPEC CPU2017": if SPEC_SUITE != "SPEC CPU2017":
contents.append("hw_cpu_mhz = %s" % cpuinfo.get("cpu MHz", "?")) contents.append("hw_cpu_mhz = %s" % cpuinfo.get("cpu MHz", "?"))
contents.append("hw_nchips = %d" % chips) contents.append("hw_nchips = %d" % chips)
if SPEC_SUITE != "SPEC CPU2017": if SPEC_SUITE != "SPEC CPU2017":
contents.append("hw_ncoresperchip = %d" % cores_per_chip) contents.append("hw_ncoresperchip = %d" % cores_per_chip)
contents.append("hw_vendor = %s" % cpuinfo.get("vendor_id", "?")) contents.append("hw_vendor = %s" % cpuinfo.get("vendor_id", "?"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment