Remove deprecated local resource flags

Follow up for #20398, kill deprecated flags.

Closes #21684.

PiperOrigin-RevId: 823202836
Change-Id: Ife47d09de29139f3f95dd3817de551b41ac0920b

Author: AlessandroPatti

site/en/docs/user-manual.md

@@ -745,7 +745,7 @@ by Bazel's scheduler, which tries to avoid running concurrent jobs
 that will use up more resources (RAM or CPU) than are available,
 based on some (very crude) estimates of the resource consumption
 of each job. The behavior of the scheduler can be controlled by
-the `--local_ram_resources` option.
+the `--local_resources` option.
 
 #### `--progress_report_interval={{ "<var>" }}n{{ "</var>" }}` {:progress-report-interval}
 
@@ -761,13 +761,13 @@ that progress is reported once every minute.
 When bazel is using cursor control, as specified by
 [`--curses`](#curses), progress is reported every second.
 
-#### `--local_{ram,cpu}_resources {{ "<var>" }}resources or resource expression{{ "</var>" }}` {:#local-resources}
+#### `--local_resources {{ "<var>" }}resources or resource expression{{ "</var>" }}` {:#local-resources}
 
 These options specify the amount of local resources (RAM in MB and number of CPU logical cores)
 that Bazel can take into consideration when scheduling build and test activities to run locally. They take
-an integer, or a keyword (HOST_RAM or HOST_CPUS) optionally followed by `[-|*`float`]`
-(for example, `--local_cpu_resources=2`, `--local_ram_resources=HOST_RAM*.5`,
-`--local_cpu_resources=HOST_CPUS-1`).
+an float, or a keyword (HOST_RAM or HOST_CPUS) optionally followed by `[-|*`float`]`
+(for example, `--local_resources=cpu=2`, `--local_resources=memory=HOST_RAM*.5`,
+`--local_resources=cpu=HOST_CPUS-1`).
 The flags are independent; one or both may be set. By default, Bazel estimates
 the amount of RAM and number of CPU cores directly from the local system's configuration.
 

site/en/remote/dynamic.md

@@ -139,7 +139,7 @@ management option. It takes a value from 0 to 1, 0 turning off this feature.
 When set to a value above 0, Bazel adjusts the number of
 locally scheduled actions when many actions waiting to
 be scheduled. Setting it to 1 allows as many actions to be scheduled as there
-are CPUs available (as per `--local_cpu_resources`). Lower values set the number
+are CPUs available (as per `--local_resources`). Lower values set the number
 of actions scheduled to correspondingly fewer as higher numbers of actions are
 available to run. This may sound counter-intuitive, but with a good remote
 system, local execution does not help much when many actions are being run, and

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

@@ -24,7 +24,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
-import com.google.common.collect.Streams;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.flogger.GoogleLogger;
 import com.google.devtools.build.lib.actions.Action;
@@ -111,7 +110,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Collection;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
@@ -947,26 +945,10 @@ private Builder createBuilder(
   @VisibleForTesting
   public static void configureResourceManager(ResourceManager resourceMgr, BuildRequest request) {
     ExecutionOptions options = request.getOptions(ExecutionOptions.class);
-    ImmutableMap<String, Double> cpuRam =
-        ImmutableMap.of(
-            ResourceSet.CPU,
-            // Replace with 1.0 * ResourceConverter.HOST_CPUS.get() after flag deprecation
-            options.localCpuResources,
-            ResourceSet.MEMORY,
-            // Replace with 0.67 * ResourceConverter.HOST_RAM.get() after flag deprecation
-            options.localRamResources);
-    ImmutableMap<String, Double> resources =
-        Streams.concat(
-                options.localExtraResources.stream(),
-                cpuRam.entrySet().stream(),
-                options.localResources.stream())
-            .collect(
-                ImmutableMap.toImmutableMap(
-                    Map.Entry::getKey, Map.Entry::getValue, (v1, v2) -> v2));
-
     resourceMgr.setAvailableResources(
         ResourceSet.create(
-            resources, options.usingLocalTestJobs() ? options.localTestJobs : Integer.MAX_VALUE));
+            options.getLocalResources(),
+            options.usingLocalTestJobs() ? options.localTestJobs : Integer.MAX_VALUE));
 
     resourceMgr.initializeCpuLoadFunctionality(
         MachineLoadProvider.instance(),

src/main/java/com/google/devtools/build/lib/dynamic/BUILD

@@ -19,6 +19,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:runtime",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
+        "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/concurrent:thread_safety",
         "//src/main/java/com/google/devtools/build/lib/events",

src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java

@@ -21,6 +21,7 @@
 import com.google.common.flogger.GoogleLogger;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ResourceSet;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnStrategy;
 import com.google.devtools.build.lib.actions.Spawns;
@@ -151,7 +152,7 @@ public void registerSpawnStrategies(
     registerSpawnStrategies(
         registryBuilder,
         options,
-        (int) execOptions.localCpuResources,
+        execOptions.getLocalResources().get(ResourceSet.CPU).intValue(),
         env.getOptions().getOptions(BuildRequestOptions.class).jobs);
   }
 

src/main/java/com/google/devtools/build/lib/exec/BUILD

@@ -91,6 +91,7 @@ java_library(
     deps = [
         ":regex_filter_assignment_converter",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
         "//src/main/java/com/google/devtools/build/lib/analysis/config:per_label_options",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:cpu_resource_converter",

src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java

@@ -13,13 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.lib.exec;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionContext.ShowSubcommands;
+import com.google.devtools.build.lib.actions.LocalHostCapacity;
+import com.google.devtools.build.lib.actions.ResourceSet;
 import com.google.devtools.build.lib.analysis.config.PerLabelOptions;
-import com.google.devtools.build.lib.util.CpuResourceConverter;
 import com.google.devtools.build.lib.util.OptionsUtils;
-import com.google.devtools.build.lib.util.RamResourceConverter;
 import com.google.devtools.build.lib.util.RegexFilter;
 import com.google.devtools.build.lib.util.ResourceConverter;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -288,70 +289,6 @@ public boolean shouldMaterializeParamFiles() {
               + " summary.")
   public TestSummaryFormat testSummary;
 
-  @Option(
-      name = "local_cpu_resources",
-      defaultValue = ResourceConverter.HOST_CPUS_KEYWORD,
-      deprecationWarning =
-          "--local_cpu_resources is deprecated, please use --local_resources=cpu= instead.",
-      documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
-      effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
-      help =
-          "Explicitly set the total number of local CPU cores available to Bazel to spend on build"
-              + " actions executed locally. Takes an integer, or \""
-              + ResourceConverter.HOST_CPUS_KEYWORD
-              + "\", optionally followed"
-              + " by [-|*]<float> (eg. "
-              + ResourceConverter.HOST_CPUS_KEYWORD
-              + "*.5"
-              + " to use half the available CPU cores). By default, (\""
-              + ResourceConverter.HOST_CPUS_KEYWORD
-              + "\"), Bazel will query system"
-              + " configuration to estimate the number of CPU cores available.",
-      converter = CpuResourceConverter.class)
-  public double localCpuResources;
-
-  @Option(
-      name = "local_ram_resources",
-      defaultValue = ResourceConverter.HOST_RAM_KEYWORD + "*.67",
-      deprecationWarning =
-          "--local_ram_resources is deprecated, please use --local_resources=memory= instead.",
-      documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
-      effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
-      help =
-          "Explicitly set the total amount of local host RAM (in MB) available to Bazel to spend on"
-              + " build actions executed locally. Takes an integer, or \""
-              + ResourceConverter.HOST_RAM_KEYWORD
-              + "\", optionally followed by [-|*]<float>"
-              + " (eg. "
-              + ResourceConverter.HOST_RAM_KEYWORD
-              + "*.5 to use half the available"
-              + " RAM). By default, (\""
-              + ResourceConverter.HOST_RAM_KEYWORD
-              + "*.67\"),"
-              + " Bazel will query system configuration to estimate the amount of RAM available"
-              + " and will use 67% of it.",
-      converter = RamResourceConverter.class)
-  public double localRamResources;
-
-  @Option(
-      name = "local_extra_resources",
-      defaultValue = "null",
-      deprecationWarning =
-          "--local_extra_resources is deprecated, please use --local_resources instead.",
-      documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
-      effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
-      allowMultiple = true,
-      help =
-          "Set the number of extra resources available to Bazel. "
-              + "Takes in a string-float pair. Can be used multiple times to specify multiple "
-              + "types of extra resources. Bazel will limit concurrently running actions "
-              + "based on the available extra resources and the extra resources required. "
-              + "Tests can declare the amount of extra resources they need "
-              + "by using a tag of the \"resources:<resoucename>:<amount>\" format. "
-              + "Available CPU, RAM and resources cannot be set with this flag.",
-      converter = Converters.StringToDoubleAssignmentConverter.class)
-  public List<Map.Entry<String, Double>> localExtraResources;
-
   @Option(
       name = "local_resources",
       defaultValue = "null",
@@ -372,11 +309,19 @@ public boolean shouldMaterializeParamFiles() {
               + "types of resources. Bazel will limit concurrently running actions "
               + "based on the available resources and the resources required. "
               + "Tests can declare the amount of resources they need "
-              + "by using a tag of the \"resources:<resource name>:<amount>\" format. "
-              + "Overrides resources specified by --local_{cpu|ram|extra}_resources.",
+              + "by using a tag of the \"resources:<resource name>:<amount>\" format. ",
       converter = ResourceConverter.AssignmentConverter.class)
   public List<Map.Entry<String, Double>> localResources;
 
+  public ImmutableMap<String, Double> getLocalResources() {
+    ImmutableMap.Builder<String, Double> resources = ImmutableMap.builder();
+    return resources
+        .put(ResourceSet.CPU, LocalHostCapacity.getLocalHostCapacity().getCpuUsage())
+        .put(ResourceSet.MEMORY, .67 * LocalHostCapacity.getLocalHostCapacity().getMemoryMb())
+        .putAll(localResources)
+        .buildKeepingLast();
+  }
+
   @Option(
       name = "experimental_cpu_load_scheduling",
       defaultValue = "false",