Commit 758ae1b9 authored by sebastian.buchwald1's avatar sebastian.buchwald1
Browse files

Fix config warnings for SPEC CPU2017

parent 9bbcbacf
...@@ -333,13 +333,6 @@ ignore_errors = yes ...@@ -333,13 +333,6 @@ ignore_errors = yes
setprocgroup = yes setprocgroup = yes
ignore_sigint = no ignore_sigint = no
test_sponsor = IPD Snelting test_sponsor = IPD Snelting
tester_name = IPD Snelting
company_name = Karlsruhe Institute of Technology KIT
prepared_by = spec.py script
## just assuming:
hw_fpu = Integrated
sw_state = Multi-user
""" """
def get_portability(options, prog, lang): def get_portability(options, prog, lang):
if lang == "c": if lang == "c":
...@@ -393,6 +386,15 @@ def generate_spec_config(options, progs): ...@@ -393,6 +386,15 @@ def generate_spec_config(options, progs):
cpuinfo = get_cpu_info() cpuinfo = get_cpu_info()
meminfo = get_mem_info() meminfo = get_mem_info()
notes = 0 notes = 0
if SPEC_SUITE != "SPEC CPU2017":
contents.append("tester_name = IPD Snelting")
contents.append("company_name = Karlsruhe Institute of Technology KIT")
contents.append("prepared_by = spec.py script")
contents.append("")
contents.append("## just assuming:")
if SPEC_SUITE != "SPEC CPU2017":
contents.append("hw_fpu = Integrated")
contents.append("sw_state = Multi-user")
if options.build_only: if options.build_only:
contents.append("action = build") contents.append("action = build")
else: else:
...@@ -420,9 +422,11 @@ def generate_spec_config(options, progs): ...@@ -420,9 +422,11 @@ def generate_spec_config(options, progs):
elif SPEC_SUITE == "SPEC CPU2000": elif SPEC_SUITE == "SPEC CPU2000":
contents.append("hw_model = %s" % cpuinfo["model name"]) contents.append("hw_model = %s" % cpuinfo["model name"])
contents.append("hw_ncpu = %d" % cores) contents.append("hw_ncpu = %d" % cores)
contents.append("hw_cpu_mhz = %s" % cpuinfo.get("cpu MHz", "?")) if SPEC_SUITE != "SPEC CPU2017":
contents.append("hw_cpu_mhz = %s" % cpuinfo.get("cpu MHz", "?"))
contents.append("hw_nchips = %d" % chips) contents.append("hw_nchips = %d" % chips)
contents.append("hw_ncoresperchip = %d" % cores_per_chip) if SPEC_SUITE != "SPEC CPU2017":
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", "?"))
contents.append("hw_memory = %s" % meminfo["MemTotal"]) contents.append("hw_memory = %s" % meminfo["MemTotal"])
contents.append("hw_pcache = %s" % cpuinfo.get("cache size", "?")) contents.append("hw_pcache = %s" % cpuinfo.get("cache size", "?"))
......
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