Make Google benchmark dependency a default

Bug: v8:11639
Change-Id: I3352261c5593c33154aa8f1a931bf3ee351f536a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2831487Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Almothana Athamneh <almuthanna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#74098}

DEPS

@@ -9,7 +9,6 @@ gclient_gn_args = [
   # TODO(https://crbug.com/1137662, https://crbug.com/1080854)
   # Remove when migration is complete.
   'checkout_fuchsia_for_arm64_host',
-  'checkout_google_benchmark',
 ]
 
 vars = {
@@ -44,8 +43,6 @@ vars = {
   'download_jsfunfuzz': False,
   'check_v8_header_includes': False,
 
-  'checkout_google_benchmark' : False,
-
   # GN CIPD package version.
   'gn_version': 'git_revision:dba01723a441c358d843a575cb7720d54ddcdf92',
 
@@ -199,7 +196,6 @@ deps = {
     Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '07f4869221012b16b7f9ee685d94856e1fc9f361',
   'third_party/google_benchmark/src': {
     'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '7f27afe83b82f3a98baf58ef595814b9d42a5b2b',
-    'condition': 'checkout_google_benchmark',
   },
   'third_party/jinja2':
     Var('chromium_url') + '/chromium/src/third_party/jinja2.git' + '@' + '11b6b3e5971d760bd2d310f77643f55a818a6d25',

gni/v8.gni

@@ -84,7 +84,7 @@ declare_args() {
   # Scan the call stack conservatively during garbage collection.
   v8_enable_conservative_stack_scanning = false
 
-  v8_enable_google_benchmark = checkout_google_benchmark
+  v8_enable_google_benchmark = false
 
   cppgc_is_standalone = false
 }

infra/mb/mb_config.pyl

@@ -648,7 +648,7 @@
     'debug_bot': {
       'mixins': [
         'debug', 'shared', 'goma', 'v8_enable_slow_dchecks',
-        'v8_optimized_debug'],
+        'v8_optimized_debug', 'v8_enable_google_benchmark'],
     },
 
     'debug_bot_no_goma': {
@@ -748,7 +748,7 @@
     },
 
     'release_bot': {
-      'mixins': ['release', 'static', 'goma'],
+      'mixins': ['release', 'static', 'goma', 'v8_enable_google_benchmark'],
     },
 
     'release_bot_no_goma': {
@@ -845,6 +845,10 @@
       'gn_args': 'v8_enable_slow_dchecks=true',
     },
 
+    'v8_enable_google_benchmark': {
+      'gn_args': 'v8_enable_google_benchmark=true',
+    },
+
     'webassembly_disabled': {
       'gn_args': 'v8_enable_webassembly=false',
     },

test/benchmarks/cpp/BUILD.gn

@@ -9,7 +9,7 @@ group("gn_all") {
 
   deps = []
 
-  if (v8_enable_google_benchmark) {
+  if (v8_enable_google_benchmark && !is_win) {
     deps += [
       ":empty_benchmark",
       "cppgc:gn_all",
@@ -17,7 +17,7 @@ group("gn_all") {
   }
 }
 
-if (v8_enable_google_benchmark) {
+if (v8_enable_google_benchmark && !is_win) {
   v8_executable("empty_benchmark") {
     testonly = true
 

test/benchmarks/cpp/cppgc/BUILD.gn

@@ -9,12 +9,12 @@ group("gn_all") {
 
   deps = []
 
-  if (v8_enable_google_benchmark) {
+  if (v8_enable_google_benchmark && !is_win) {
     deps += [ ":cppgc_basic_benchmarks" ]
   }
 }
 
-if (v8_enable_google_benchmark) {
+if (v8_enable_google_benchmark && !is_win) {
   v8_source_set("cppgc_benchmark_support") {
     testonly = true
 

third_party/google_benchmark/BUILD.gn

@@ -3,8 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/gclient_args.gni")
+import("../../gni/v8.gni")
 
-if (checkout_google_benchmark) {
+if (v8_enable_google_benchmark) {
   config("benchmark_config") {
     include_dirs = [ "src/include" ]
   }