Skip to content

Fuzzer: Use a directory for important fuzz testcases #6297

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

Merged
kripken merged 7 commits into from
Feb 12, 2024
Merged

Fuzzer: Use a directory for important fuzz testcases #6297

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab6b446
Fuzzer: Use a directory for important fuzz testcases
kripken Feb 10, 2024
92a00e7
work
kripken Feb 12, 2024
b58cbc4
work
kripken Feb 12, 2024
2a7da34
work
kripken Feb 12, 2024
5043ca2
Merge remote-tracking branch 'origin/main' into fuzz.cases
kripken Feb 12, 2024
f2e33ec
add the dir
kripken Feb 12, 2024
1693597
file
kripken Feb 12, 2024
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
32 changes: 10 additions & 22 deletions scripts/fuzz_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,24 +200,12 @@ def randomize_fuzz_settings():


def init_important_initial_contents():
FIXED_IMPORTANT_INITIAL_CONTENTS = [
# Perenially-important passes
os.path.join('lit', 'passes', 'optimize-instructions-mvp.wast'),
os.path.join('passes', 'optimize-instructions_fuzz-exec.wast'),
]
MANUAL_RECENT_INITIAL_CONTENTS = [
# Recently-added or modified passes. These can be added to and pruned
# frequently.
os.path.join('lit', 'passes', 'once-reduction.wast'),
os.path.join('passes', 'remove-unused-brs_enable-multivalue.wast'),
os.path.join('lit', 'passes', 'optimize-instructions-bulk-memory.wast'),
os.path.join('lit', 'passes', 'optimize-instructions-ignore-traps.wast'),
os.path.join('lit', 'passes', 'optimize-instructions-gc.wast'),
os.path.join('lit', 'passes', 'optimize-instructions-gc-iit.wast'),
os.path.join('lit', 'passes', 'optimize-instructions-call_ref.wast'),
os.path.join('lit', 'passes', 'inlining_splitting.wast'),
os.path.join('heap-types.wast'),
]
# Always grab important fuzz testcases from the designated directory for
# that. We consider them fixed content to always use.
FIXED_IMPORTANT_INITIAL_CONTENTS = fuzz_cases

# If auto_initial_contents is set we'll also grab all test files that are
# recent.
RECENT_DAYS = 30

# Returns the list of test wast/wat files added or modified within the
Expand Down Expand Up @@ -268,9 +256,6 @@ def is_git_repo():
if shared.options.auto_initial_contents:
print(f'(automatically selected: within last {RECENT_DAYS} days):')
recent_contents += auto_select_recent_initial_contents()
else:
print('(manually selected):')
recent_contents = MANUAL_RECENT_INITIAL_CONTENTS
for test in recent_contents:
print(' ' + test)
print()
Expand Down Expand Up @@ -335,7 +320,7 @@ def pick_initial_contents():
return
# some of the time use initial contents that are known to be especially
# important
if random.random() < 0.5:
if IMPORTANT_INITIAL_CONTENTS and random.random() < 0.5:
test_name = random.choice(IMPORTANT_INITIAL_CONTENTS)
else:
test_name = random.choice(all_tests)
Expand Down Expand Up @@ -1393,6 +1378,7 @@ def handle(self, wasm):


test_suffixes = ['*.wasm', '*.wast', '*.wat']

core_tests = shared.get_tests(shared.get_test_dir('.'), test_suffixes)
passes_tests = shared.get_tests(shared.get_test_dir('passes'), test_suffixes)
spec_tests = shared.get_tests(shared.get_test_dir('spec'), test_suffixes)
Expand All @@ -1402,6 +1388,8 @@ def handle(self, wasm):
lit_tests = shared.get_tests(shared.get_test_dir('lit'), test_suffixes, recursive=True)
all_tests = core_tests + passes_tests + spec_tests + wasm2js_tests + lld_tests + unit_tests + lit_tests

fuzz_cases = shared.get_tests(shared.get_test_dir('fuzz'), test_suffixes, recursive=True)
Copy link
Copy Markdown
Member

@tlively tlively Feb 10, 2024

Choose a reason for hiding this comment

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

This won't break if the fuzz directory doesn't exist, will it?

Copy link
Copy Markdown
Member Author

@kripken kripken Feb 12, 2024

Choose a reason for hiding this comment

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

Good point, I'll add a readme.txt in that directory to force it to exist in git.



# Do one test, given an input file for -ttf and some optimizations to run
def test_one(random_input, given_wasm):
Expand Down