[clusterfuzz] Split directory structure

After https://crrev.com/c/3416191 there are too many mixed concerns in
the clusterfuzz directory. We split it into js-fuzzer, foozzie and
trials.

Change-Id: I9a21ee83985e6113d77acba4583e99df88723c60
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3443505
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Auto-Submit: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Almothana Athamneh <almuthanna@chromium.org>
Commit-Queue: Almothana Athamneh <almuthanna@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78981}

BUILD.gn

@@ -5931,7 +5931,7 @@ group("v8_clusterfuzz") {
   deps = [
     ":d8",
     ":v8_simple_inspector_fuzzer",
-    "tools/clusterfuzz:v8_clusterfuzz_resources",
+    "tools/clusterfuzz/trials:v8_clusterfuzz_resources",
   ]
 
   if (v8_multi_arch_build) {
@@ -5940,7 +5940,7 @@ group("v8_clusterfuzz") {
       ":d8(//build/toolchain/linux:clang_x64_v8_arm64)",
       ":d8(//build/toolchain/linux:clang_x86)",
       ":d8(//build/toolchain/linux:clang_x86_v8_arm)",
-      ":d8(tools/clusterfuzz/toolchain:clang_x64_pointer_compression)",
+      ":d8(tools/clusterfuzz/foozzie/toolchain:clang_x64_pointer_compression)",
     ]
   }
 }
@@ -6156,7 +6156,7 @@ v8_executable("d8") {
   }
 
   if (v8_correctness_fuzzer) {
-    deps += [ "tools/clusterfuzz:v8_correctness_fuzzer_resources" ]
+    deps += [ "tools/clusterfuzz/foozzie:v8_correctness_fuzzer_resources" ]
   }
 
   defines = []

test/mjsunit/BUILD.gn

@@ -13,9 +13,9 @@ group("v8_mjsunit") {
   data = [
     "./",
     "../../tools/arguments.mjs",
-    "../../tools/clusterfuzz/v8_mock.js",
-    "../../tools/clusterfuzz/v8_mock_archs.js",
-    "../../tools/clusterfuzz/v8_mock_webassembly.js",
+    "../../tools/clusterfuzz/foozzie/v8_mock.js",
+    "../../tools/clusterfuzz/foozzie/v8_mock_archs.js",
+    "../../tools/clusterfuzz/foozzie/v8_mock_webassembly.js",
     "../../tools/codemap.mjs",
     "../../tools/sourcemap.mjs",
     "../../tools/consarray.mjs",

test/mjsunit/tools/foozzie.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Flags: --allow-natives-syntax --correctness-fuzzer-suppressions
-// Files: tools/clusterfuzz/v8_mock.js
+// Files: tools/clusterfuzz/foozzie/v8_mock.js
 
 // Test foozzie mocks for differential fuzzing.
 

test/mjsunit/tools/foozzie_archs.js

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 // Flags: --allow-natives-syntax
-// Files: tools/clusterfuzz/v8_mock.js
-// Files: tools/clusterfuzz/v8_mock_archs.js
+// Files: tools/clusterfuzz/foozzie/v8_mock.js
+// Files: tools/clusterfuzz/foozzie/v8_mock_archs.js
 
 // Test foozzie architecture-specific mocks for differential fuzzing.
 

test/mjsunit/tools/foozzie_webassembly.js

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 // Flags: --allow-natives-syntax
-// Files: tools/clusterfuzz/v8_mock.js
-// Files: tools/clusterfuzz/v8_mock_webassembly.js
+// Files: tools/clusterfuzz/foozzie/v8_mock.js
+// Files: tools/clusterfuzz/foozzie/v8_mock_webassembly.js
 
 // Test foozzie webassembly-specfific mocks for differential fuzzing.
 

tools/clusterfuzz/BUILD.gn → tools/clusterfuzz/foozzie/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../gni/v8.gni")
+import("../../../gni/v8.gni")
 
 if (v8_correctness_fuzzer) {
   copy("v8_correctness_fuzzer_resources") {
@@ -23,8 +23,3 @@ if (v8_correctness_fuzzer) {
     outputs = [ "$root_out_dir/{{source_file_part}}" ]
   }
 }
-
-copy("v8_clusterfuzz_resources") {
-  sources = [ "clusterfuzz_trials_config.json" ]
-  outputs = [ "$root_out_dir/{{source_file_part}}" ]
-}

tools/clusterfuzz/foozzie/PRESUBMIT.py

+# Copyright 2018 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import json
+
+
+def _RunTests(input_api, output_api):
+  return input_api.RunTests(input_api.canned_checks.GetUnitTestsInDirectory(
+      input_api, output_api, '.', files_to_check=['v8_foozzie_test.py$']))
+
+def _CommonChecks(input_api, output_api):
+  """Checks common to both upload and commit."""
+  checks = [
+    _RunTests,
+  ]
+
+  return sum([check(input_api, output_api) for check in checks], [])
+
+def CheckChangeOnCommit(input_api, output_api):
+  return _CommonChecks(input_api, output_api)
+
+def CheckChangeOnUpload(input_api, output_api):
+  return _CommonChecks(input_api, output_api)

tools/clusterfuzz/trials/BUILD.gn

+# Copyright 2022 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+copy("v8_clusterfuzz_resources") {
+  sources = [ "clusterfuzz_trials_config.json" ]
+  outputs = [ "$root_out_dir/{{source_file_part}}" ]
+}

tools/clusterfuzz/PRESUBMIT.py → tools/clusterfuzz/trials/PRESUBMIT.py

-# Copyright 2018 the V8 project authors. All rights reserved.
+# Copyright 2022 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -39,25 +39,16 @@ def _CheckTrialsConfig(input_api, output_api):
 
   return [output_api.PresubmitError(r) for r in results]
 
-def _RunTests(input_api, output_api):
-  return input_api.RunTests(input_api.canned_checks.GetUnitTestsInDirectory(
-      input_api, output_api, '.', files_to_check=['v8_foozzie_test.py$']))
-
 def _CommonChecks(input_api, output_api):
   """Checks common to both upload and commit."""
   checks = [
     _CheckTrialsConfig,
-    _RunTests,
   ]
 
   return sum([check(input_api, output_api) for check in checks], [])
 
 def CheckChangeOnCommit(input_api, output_api):
-  results = []
-  results.extend(_CommonChecks(input_api, output_api))
-  return results
+  return _CommonChecks(input_api, output_api)
 
 def CheckChangeOnUpload(input_api, output_api):
-  results = []
-  results.extend(_CommonChecks(input_api, output_api))
-  return results
+  return _CommonChecks(input_api, output_api)

tools/v8_presubmit.py

@@ -741,7 +741,7 @@ def CheckDeps(workspace):
 def PyTests(workspace):
   result = True
   for script in [
-      join(workspace, 'tools', 'clusterfuzz', 'v8_foozzie_test.py'),
+      join(workspace, 'tools', 'clusterfuzz', 'foozzie', 'v8_foozzie_test.py'),
       join(workspace, 'tools', 'release', 'test_scripts.py'),
       join(workspace, 'tools', 'unittests', 'run_tests_test.py'),
       join(workspace, 'tools', 'unittests', 'run_perf_test.py'),