Revert "Widen CPU affinity set. (#53136)"

Jonah Williams · web-flow · commit ba9389cfc03b · 2024-06-07T08:04:50.000-07:00
This reverts commit 926b292.
diff --git a/fml/cpu_affinity.cc b/fml/cpu_affinity.cc
@@ -58,8 +58,6 @@ CPUSpeedTracker::CPUSpeedTracker(std::vector<CpuIndexAndSpeed> data)
     }
     if (data.speed == min_speed_value) {
       efficiency_.push_back(data.index);
-    } else {
-      not_efficiency_.push_back(data.index);
     }
   }
 
@@ -79,8 +77,6 @@ const std::vector<size_t>& CPUSpeedTracker::GetIndices(
       return efficiency_;
     case CpuAffinity::kNotPerformance:
       return not_performance_;
-    case CpuAffinity::kNotEfficiency:
-      return not_efficiency_;
   }
 }
 
diff --git a/fml/cpu_affinity.h b/fml/cpu_affinity.h
@@ -26,9 +26,6 @@ enum class CpuAffinity {
 
   /// @brief Request affinity for all non-performance cores.
   kNotPerformance,
-
-  /// @brief Request affinity for all non-efficiency cores.
-  kNotEfficiency,
 };
 
 /// @brief Request count of efficiency cores.
@@ -82,7 +79,6 @@ class CPUSpeedTracker {
   std::vector<size_t> efficiency_;
   std::vector<size_t> performance_;
   std::vector<size_t> not_performance_;
-  std::vector<size_t> not_efficiency_;
 };
 
 /// @note Visible for testing.
diff --git a/fml/cpu_affinity_unittests.cc b/fml/cpu_affinity_unittests.cc
@@ -29,9 +29,6 @@ TEST(CpuAffinity, NormalSlowMedFastCores) {
   ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance).size(), 2u);
   ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[0], 0u);
   ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[1], 1u);
-  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 2u);
-  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);
-  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[1], 2u);
 }
 
 TEST(CpuAffinity, NoCpuData) {
diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc
@@ -49,14 +49,14 @@ static void AndroidPlatformThreadConfigSetter(
       break;
     }
     case fml::Thread::ThreadPriority::kDisplay: {
-      fml::RequestAffinity(fml::CpuAffinity::kNotEfficiency);
+      fml::RequestAffinity(fml::CpuAffinity::kPerformance);
       if (::setpriority(PRIO_PROCESS, 0, -1) != 0) {
         FML_LOG(ERROR) << "Failed to set UI task runner priority";
       }
       break;
     }
     case fml::Thread::ThreadPriority::kRaster: {
-      fml::RequestAffinity(fml::CpuAffinity::kNotEfficiency);
+      fml::RequestAffinity(fml::CpuAffinity::kPerformance);
       // Android describes -8 as "most important display threads, for
       // compositing the screen and retrieving input events". Conservatively
       // set the raster thread to slightly lower priority than it.

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ CPUSpeedTracker::CPUSpeedTracker(std::vector<CpuIndexAndSpeed> data)`
`58`	`58`	`}`
`59`	`59`	`if (data.speed == min_speed_value) {`
`60`	`60`	`efficiency_.push_back(data.index);`
`61`		`- } else {`
`62`		`- not_efficiency_.push_back(data.index);`
`63`	`61`	`}`
`64`	`62`	`}`
`65`	`63`
`@@ -79,8 +77,6 @@ const std::vector<size_t>& CPUSpeedTracker::GetIndices(`
`79`	`77`	`return efficiency_;`
`80`	`78`	`case CpuAffinity::kNotPerformance:`
`81`	`79`	`return not_performance_;`
`82`		`- case CpuAffinity::kNotEfficiency:`
`83`		`- return not_efficiency_;`
`84`	`80`	`}`
`85`	`81`	`}`
`86`	`82`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@ TEST(CpuAffinity, NormalSlowMedFastCores) {`
`29`	`29`	`ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance).size(), 2u);`
`30`	`30`	`ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[0], 0u);`
`31`	`31`	`ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[1], 1u);`
`32`		`- ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 2u);`
`33`		`- ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);`
`34`		`- ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[1], 2u);`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`TEST(CpuAffinity, NoCpuData) {`
Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,14 @@ static void AndroidPlatformThreadConfigSetter(`
`49`	`49`	`break;`
`50`	`50`	`}`
`51`	`51`	`case fml::Thread::ThreadPriority::kDisplay: {`
`52`		`- fml::RequestAffinity(fml::CpuAffinity::kNotEfficiency);`
	`52`	`+ fml::RequestAffinity(fml::CpuAffinity::kPerformance);`
`53`	`53`	`if (::setpriority(PRIO_PROCESS, 0, -1) != 0) {`
`54`	`54`	`FML_LOG(ERROR) << "Failed to set UI task runner priority";`
`55`	`55`	`}`
`56`	`56`	`break;`
`57`	`57`	`}`
`58`	`58`	`case fml::Thread::ThreadPriority::kRaster: {`
`59`		`- fml::RequestAffinity(fml::CpuAffinity::kNotEfficiency);`
	`59`	`+ fml::RequestAffinity(fml::CpuAffinity::kPerformance);`
`60`	`60`	`// Android describes -8 as "most important display threads, for`
`61`	`61`	`// compositing the screen and retrieving input events". Conservatively`
`62`	`62`	`// set the raster thread to slightly lower priority than it.`