Skip to content

test_benchmark.py: Replace DEFAULT_ARG with BENCHMARK_MODE #27294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbc100 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

test_benchmark.py: Replace DEFAULT_ARG with BENCHMARK_MODE #27294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test/test_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# 3: 1 second
# 4: 5 seconds
# 5: 10 seconds
DEFAULT_ARG = '4'
BENCHMARK_MODE = '4'

EMTEST_REPS = int(os.environ.get('EMTEST_REPS', '5'))

Expand Down Expand Up @@ -90,7 +90,7 @@ def bench(self, args, reps=EMTEST_REPS, output_parser=None, expected_output=None
if expected_output is not None and expected_output not in output:
raise ValueError('Incorrect benchmark output:\n' + output)

if not output_parser or args == ['0']: # if arg is 0, we are not running code, and have no output to parse

@sbc100 sbc100 Jul 9, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that checking for args == ['0'] wasn't as precise here since benchmarks like lua were passing their own args, which meant the mode was sometimes passed as the second argument

if not output_parser or BENCHMARK_MODE == '0': # When BENCHMARK_MODE is 0, we are not running code, and have no output to parse
curr = time.time() - start
else:
try:
Expand Down Expand Up @@ -487,7 +487,7 @@ def do_benchmarkf(self, name, filename, expected_output='FAIL', args=None,
raise Exception('error, no benchmarkers')

filename = common.maybe_test_file(filename)
args = args or [DEFAULT_ARG]
args = (args or []) + [BENCHMARK_MODE]

dirname = self.get_dir()
dest_filename = os.path.join(dirname, os.path.basename(filename))
Expand Down Expand Up @@ -936,13 +936,13 @@ def test_base64(self):

@non_core
def test_life(self):
self.do_benchmarkf('life', 'life.c', '''--------------------------------''')
self.do_benchmarkf('life', 'life.c', '--------------------------------')

def test_zzz_linpack(self):
def output_parser(output):
mflops = re.search(r'Unrolled Double Precision ([\d\.]+) Mflops', output).group(1)
return 10000.0 / float(mflops)
self.do_benchmarkf('linpack_double', 'benchmark/linpack2.c', '''Unrolled Double Precision''',
self.do_benchmarkf('linpack_double', 'benchmark/linpack2.c', 'Unrolled Double Precision',
output_parser=output_parser)

# Benchmarks the synthetic performance of calling native functions.
Expand Down Expand Up @@ -1063,7 +1063,7 @@ def lib_builder(name, native, env_init):
return self.get_library(os.path.join('third_party', 'lua_native' if native else 'lua'), [os.path.join('src', 'lua.o'), os.path.join('src', 'liblua.a')], make=['make', 'generic'], configure=None, native=native, cache_name_extra=name, env_init=env_init, force_rebuild=native)

self.do_benchmark('lua_' + benchmark, '', expected,
force_c=True, args=[benchmark + '.lua', DEFAULT_ARG],
force_c=True, args=[benchmark + '.lua'],
emcc_args=['--embed-file', benchmark + '.lua', '-sFORCE_FILESYSTEM', '-sMINIMAL_RUNTIME=0'], # not minimal because of files
lib_builder=lib_builder, native_exec=os.path.join('building', 'third_party', 'lua_native', 'src', 'lua'),
output_parser=output_parser)
Expand Down Expand Up @@ -1178,7 +1178,7 @@ def test_zzz_poppler(self):
out(files.length + ' files emitted, total output size: ' + totalSize + ', hashed printout: ' + hash);
};
}
''' % DEFAULT_ARG)
''' % BENCHMARK_MODE)

def lib_builder(name, native, env_init): # noqa
if '-m64' in env_init.get('CFLAGS', ''):
Expand Down