[test] Replace turboprop_as_toptier with always_sparkplug

In the 'extra' variant, replace turboprop_as_toptier (which is mostly
covered by turboprop) with always_sparkplug, to increase Sparkplug's
coverage on tests.

Bug: v8:11420
Change-Id: I43b7009d184a03cb163d78f1f8bd05233ef7c34e
Fixed: v8:11686
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2862769
Auto-Submit: Leszek Swirski <leszeks@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#74324}

test/cctest/cctest.status

@@ -1173,4 +1173,11 @@
   'test-code-pages/CodeRangeCorrectContents': [SKIP],
 }], # third_party_heap
 
+################################################################################
+['variant == always_sparkplug', {
+  # SFI deduplication tests check compilation state, which always_sparkplug
+  # can break.
+  'test-web-snapshots/SFIDeduplication*': [SKIP],
+}],
+
 ]

test/cctest/test-code-pages.cc

@@ -200,6 +200,13 @@ TEST(OptimizedCodeWithCodePages) {
       Handle<JSFunction> foo =
           Handle<JSFunction>::cast(v8::Utils::OpenHandle(*local_foo));
 
+      // If there is baseline code, check that it's only due to
+      // --always-sparkplug (if this check fails, we'll have to re-think this
+      // test).
+      if (foo->shared().HasBaselineData()) {
+        CHECK(FLAG_always_sparkplug);
+        return;
+      }
       AbstractCode abstract_code = foo->abstract_code(i_isolate);
       // We don't produce optimized code when run with --no-opt.
       if (!abstract_code.IsCode() && FLAG_opt == false) return;

tools/testrunner/standard_runner.py

@@ -46,7 +46,7 @@ VARIANT_ALIASES = {
   'exhaustive': MORE_VARIANTS + VARIANTS,
   # Additional variants, run on a subset of bots.
   'extra': ['nooptimization', 'future', 'no_wasm_traps', 'turboprop',
-            'instruction_scheduling', 'turboprop_as_toptier'],
+            'instruction_scheduling', 'always_sparkplug'],
 }
 
 # Extra flags passed to all tests using the standard test runner.