Revert "Simplify force-compilation generator"

This reverts commit 57da3ab.

Reason for revert: The simplification doesn't take the swarm mode
into account.

Original change's description:
> Simplify force-compilation generator
>
> This merges the code of the two generators forcing Maglev or
> Turbofan compilation. The separation is probably not adding any
> value.
>
> This also doubles the weight of the resulting generator as local
> experiments show that it's called a bit too rarely. Probably
> due to other generators being added over time.
>
> Fly-by: Remove a counter-productive generator for Dumpling.
>
> Bug: 465497343
> Change-Id: I208fc1ba47caa3b3d0f2d672b72b527e001a0f45
> Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/9020158
> Reviewed-by: Dominik Klemba <tacet@google.com>
> Commit-Queue: Michael Achenbach <machenbach@google.com>

Bug: 465497343
Change-Id: I98fdb06431c296b7a516502899b6a94712cb3dcd
Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/9026358
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Michael Achenbach <machenbach@google.com>

Author: mi-ac

Sources/FuzzilliCli/Profiles/V8CommonProfile.swift

@@ -95,7 +95,7 @@ func chooseArgumentLists(_ b: ProgramBuilder, forCalling f: Variable) -> ([Varia
     return (args[0], args[1], args[2], args[3])
 }
 
-public let ForceCompilationGenerator = CodeGenerator("ForceCompilationGenerator", inputs: .required(.function())) { b, f in
+public let ForceTurboFanCompilationGenerator = CodeGenerator("ForceTurboFanCompilationGenerator", inputs: .required(.function())) { b, f in
     assert(b.type(of: f).Is(.function()))
     let (args1, args2, args3, args4) = chooseArgumentLists(b, forCalling: f)
 
@@ -108,8 +108,25 @@ public let ForceCompilationGenerator = CodeGenerator("ForceCompilationGenerator"
     b.callFunction(f, withArgs: args2, guard: guardCalls)
     b.callFunction(f, withArgs: args3, guard: guardCalls)
 
-    let optimizer = chooseUniform(from: ["OptimizeFunctionOnNextCall", "OptimizeMaglevOnNextCall"])
-    b.eval("%\(optimizer)(%@)", with: [f]);
+    b.eval("%OptimizeFunctionOnNextCall(%@)", with: [f]);
+
+    b.callFunction(f, withArgs: args4, guard: guardCalls)
+}
+
+public let ForceMaglevCompilationGenerator = CodeGenerator("ForceMaglevCompilationGenerator", inputs: .required(.function())) { b, f in
+    assert(b.type(of: f).Is(.function()))
+    let (args1, args2, args3, args4) = chooseArgumentLists(b, forCalling: f)
+
+    let guardCalls = probability(0.5)
+
+    b.callFunction(f, withArgs: args1, guard: guardCalls)
+
+    b.eval("%PrepareFunctionForOptimization(%@)", with: [f]);
+
+    b.callFunction(f, withArgs: args2, guard: guardCalls)
+    b.callFunction(f, withArgs: args3, guard: guardCalls)
+
+    b.eval("%OptimizeMaglevOnNextCall(%@)", with: [f]);
 
     b.callFunction(f, withArgs: args4, guard: guardCalls)
 }

Sources/FuzzilliCli/Profiles/V8DumplingProfile.swift

@@ -125,7 +125,10 @@ let v8DumplingProfile = Profile(
 
     additionalCodeGenerators: [
         (ForceJITCompilationThroughLoopGenerator,  5),
-        (ForceCompilationGenerator,               20),
+        (ForceTurboFanCompilationGenerator,        5),
+        (ForceMaglevCompilationGenerator,          5),
+        (TurbofanVerifyTypeGenerator,             10),
+
         (V8GcGenerator,                           10),
     ],
 

Sources/FuzzilliCli/Profiles/V8HoleFuzzingProfile.swift

@@ -70,7 +70,8 @@ let v8HoleFuzzingProfile = Profile(
 
     additionalCodeGenerators: [
         (ForceJITCompilationThroughLoopGenerator,  5),
-        (ForceCompilationGenerator,               20),
+        (ForceTurboFanCompilationGenerator,        5),
+        (ForceMaglevCompilationGenerator,          5),
         (V8GcGenerator,                           10),
         (HoleLeakGenerator,                       25),
     ],

Sources/FuzzilliCli/Profiles/V8Profile.swift

@@ -59,7 +59,8 @@ let v8Profile = Profile(
 
     additionalCodeGenerators: [
         (ForceJITCompilationThroughLoopGenerator,  5),
-        (ForceCompilationGenerator,               20),
+        (ForceTurboFanCompilationGenerator,        5),
+        (ForceMaglevCompilationGenerator,          5),
         (TurbofanVerifyTypeGenerator,             10),
 
         (WorkerGenerator,                         10),

Sources/FuzzilliCli/Profiles/V8SandboxProfile.swift

@@ -522,7 +522,8 @@ let v8SandboxProfile = Profile(
 
     additionalCodeGenerators: [
         (ForceJITCompilationThroughLoopGenerator,  5),
-        (ForceCompilationGenerator,               20),
+        (ForceTurboFanCompilationGenerator,        5),
+        (ForceMaglevCompilationGenerator,          5),
         (V8GcGenerator,                           10),
         (WasmStructGenerator,                      5),
         (WasmArrayGenerator,                       5),