Commit 1f629aac authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[wasm] Move the wasm fuzzer corpus to a different directory

The current test/fuzzer/wasm directory is used for two things:
1) as the corpus directory for clusterfuzz
2) to test in v8 that the fuzzer runs correctly.

With the newly added files from the wasm spec tests this directory grew
quite big and adds unnecessary load on the trybots. Therefore I want to
do the following steps:
1) In this CL for V8: create a new directory for the clusterfuzz corpus
2) In chromium: use the new corpus directory
3) In v8: clean up the old directory to use it on the trybots.

R=bradnelson@chromium.org
CC=mmoroz@chromium.org

Change-Id: If690022558bb5780edf5a3649fb9745ef9c7407a
Reviewed-on: https://chromium-review.googlesource.com/490367
Commit-Queue: Brad Nelson <bradnelson@chromium.org>
Reviewed-by: 's avatarBrad Nelson <bradnelson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44991}
parent f2bd913c
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
/src/inspector/build/closure-compiler /src/inspector/build/closure-compiler
/src/inspector/build/closure-compiler.tar.gz /src/inspector/build/closure-compiler.tar.gz
/test/benchmarks/data /test/benchmarks/data
/test/fuzzer/wasm_corpus
/test/fuzzer/wasm_corpus.tar.gz
/test/fuzzer/wasm_asmjs_corpus
/test/fuzzer/wasm_asmjs_corpus.tar.gz
/test/fuzzer/wasm /test/fuzzer/wasm
/test/fuzzer/wasm.tar.gz /test/fuzzer/wasm.tar.gz
/test/fuzzer/wasm_asmjs /test/fuzzer/wasm_asmjs
......
...@@ -212,6 +212,17 @@ hooks = [ ...@@ -212,6 +212,17 @@ hooks = [
"-s", "v8/test/wasm-spec-tests/tests.tar.gz.sha1", "-s", "v8/test/wasm-spec-tests/tests.tar.gz.sha1",
], ],
}, },
{
"name": "wasm_fuzzer_new",
"pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--no_auth",
"-u",
"--bucket", "v8-wasm-fuzzer",
"-s", "v8/test/fuzzer/wasm_corpus.tar.gz.sha1",
],
},
{ {
"name": "wasm_fuzzer", "name": "wasm_fuzzer",
"pattern": ".", "pattern": ".",
...@@ -223,6 +234,17 @@ hooks = [ ...@@ -223,6 +234,17 @@ hooks = [
"-s", "v8/test/fuzzer/wasm.tar.gz.sha1", "-s", "v8/test/fuzzer/wasm.tar.gz.sha1",
], ],
}, },
{
"name": "wasm_asmjs_fuzzer_new",
"pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--no_auth",
"-u",
"--bucket", "v8-wasm-asmjs-fuzzer",
"-s", "v8/test/fuzzer/wasm_asmjs_corpus.tar.gz.sha1",
],
},
{ {
"name": "wasm_asmjs_fuzzer", "name": "wasm_asmjs_fuzzer",
"pattern": ".", "pattern": ".",
......
cf1777646f8d4557504442e9bd59e908519ffec8
\ No newline at end of file
f6b95b7dd8300efa84b6382f16cfcae4ec9fa108
\ No newline at end of file
...@@ -9,48 +9,48 @@ TOOLS_WASM_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ...@@ -9,48 +9,48 @@ TOOLS_WASM_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${TOOLS_WASM_DIR}/../.. cd ${TOOLS_WASM_DIR}/../..
rm -rf test/fuzzer/wasm rm -rf test/fuzzer/wasm_corpus
rm -rf test/fuzzer/wasm_asmjs rm -rf test/fuzzer/wasm_asmjs_corpus
tools/dev/gm.py x64.release all tools/dev/gm.py x64.release all
mkdir -p test/fuzzer/wasm mkdir -p test/fuzzer/wasm_corpus
mkdir -p test/fuzzer/wasm_asmjs mkdir -p test/fuzzer/wasm_asmjs_corpus
# asm.js # asm.js
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm_asmjs/" mjsunit/wasm/asm* --dump-wasm-module-path=./test/fuzzer/wasm_asmjs_corpus/" mjsunit/wasm/asm*
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm_asmjs/" mjsunit/asm/* --dump-wasm-module-path=./test/fuzzer/wasm_asmjs_corpus/" mjsunit/asm/*
# WASM # WASM
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm/" unittests --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" unittests
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm/" wasm-spec-tests/* --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" wasm-spec-tests/*
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm/" mjsunit/wasm/* --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" mjsunit/wasm/*
./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \ ./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
--mode=release --no-presubmit --extra-flags="--dump-wasm-module \ --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
--dump-wasm-module-path=./test/fuzzer/wasm/" \ --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" \
$(cd test/; ls cctest/wasm/test-*.cc | \ $(cd test/; ls cctest/wasm/test-*.cc | \
sed -es/wasm\\///g | sed -es/[.]cc/\\/\\*/g) sed -es/wasm\\///g | sed -es/[.]cc/\\/\\*/g)
# Delete items over 20k. # Delete items over 20k.
for x in $(find ./test/fuzzer/wasm/ -type f -size +20k) for x in $(find ./test/fuzzer/wasm_corpus/ -type f -size +20k)
do do
rm $x rm $x
done done
for x in $(find ./test/fuzzer/wasm_asmjs/ -type f -size +20k) for x in $(find ./test/fuzzer/wasm_asmjs_corpus/ -type f -size +20k)
do do
rm $x rm $x
done done
# Upload changes. # Upload changes.
cd test/fuzzer cd test/fuzzer
upload_to_google_storage.py -a -b v8-wasm-fuzzer wasm upload_to_google_storage.py -a -b v8-wasm-fuzzer wasm_corpus
upload_to_google_storage.py -a -b v8-wasm-asmjs-fuzzer wasm_asmjs upload_to_google_storage.py -a -b v8-wasm-asmjs-fuzzer wasm_asmjs_corpus
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