diff --git a/AUTHORS b/AUTHORS index 9ef5696..f5e9e66b 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -1577,6 +1577,7 @@ Wei Li <wei.c.li@intel.com> Weicong Yu <yuweicong666@gmail.com> Wen Fan <fanwen1@huawei.com> +Wendi Gan <ganwendix@gmail.com> Wenxiang Qian <leonwxqian@gmail.com> WenSheng He <wensheng.he@samsung.com> Wesley Lancel <wesleylancel@gmail.com>
diff --git a/BUILD.gn b/BUILD.gn index 5b69035..2176074 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -334,7 +334,10 @@ } if (!is_android && !is_ios && !is_fuchsia) { - deps += [ "//ui/webui/examples:webui_examples" ] + deps += [ + "//components/sync:full_proto_unittests", + "//ui/webui/examples:webui_examples", + ] } if (use_ozone) {
diff --git a/DEPS b/DEPS index d019ec4..99df8d1a 100644 --- a/DEPS +++ b/DEPS
@@ -290,7 +290,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'src_internal_revision': '650f1113f1754ec7d793132532e9abbb8629a954', + 'src_internal_revision': 'eb1be97cc81de54733a96ad8c2f933be5fe8a997', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. @@ -314,7 +314,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': 'be5be0a4f5ebf00da151a06860deb11a0ffb609f', + 'boringssl_revision': 'db421c2d800f6d2e164366af6a28bc52b2dafbf7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. @@ -1563,7 +1563,7 @@ 'src/clank': { 'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' + - '8cc75345a767e49de7d72d7b41de8febeceda0ed', + 'a4036a451c6b207002395694d73d786c0ca27bee', 'condition': 'checkout_android and checkout_src_internal', }, @@ -1717,7 +1717,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'w54q1FmsAnoW84wRiVdrixqadZb5MTS3xUN_Dm_DDbMC', + 'version': 'httE7hE1-HFsp32dX3_kpwXMpjBEgYONMrHEws9uOKgC', }, ], 'condition': 'checkout_android and non_git_source', @@ -3075,7 +3075,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/eche_app/app', - 'version': 'uATriih8ZCDA6n36_vXiT1KpvNt4mZhJic8J6jEViRoC', + 'version': 'XZc-xckgsw9t2ZDTncQHtdAnx68qjF2bxugiagcirkkC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -4673,7 +4673,7 @@ 'src/components/optimization_guide/internal': { 'url': Var('chrome_git') + '/chrome/components/optimization_guide.git' + '@' + - '767cec7806b9fe51a9bc9500ed9b4bd0e37dcb0e', + 'c97b15a7f3d4f2e4c490bbce6f8b1703edab1a38', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/browser/aw_content_browser_client_receiver_bindings.cc b/android_webview/browser/aw_content_browser_client_receiver_bindings.cc index 6c2f8cf..e1ef09e 100644 --- a/android_webview/browser/aw_content_browser_client_receiver_bindings.cc +++ b/android_webview/browser/aw_content_browser_client_receiver_bindings.cc
@@ -257,8 +257,7 @@ void AwContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( content::RenderFrameHost* render_frame_host, mojo::BinderMapWithContext<content::RenderFrameHost*>* map) { - map->Add<network_hints::mojom::NetworkHintsHandler>( - base::BindRepeating(&BindNetworkHintsHandler)); + map->Add<network_hints::mojom::NetworkHintsHandler>(&BindNetworkHintsHandler); #if BUILDFLAG(ENABLE_SPELLCHECK) auto create_spellcheck_host = @@ -268,19 +267,18 @@ std::move(receiver)); }; map->Add<spellcheck::mojom::SpellCheckHost>( - base::BindRepeating(create_spellcheck_host), - content::GetUIThreadTaskRunner({})); + create_spellcheck_host, content::GetUIThreadTaskRunner({})); #endif if (base::FeatureList::IsEnabled( features::kWebViewMediaIntegrityApiBlinkExtension)) { map->Add<blink::mojom::WebViewMediaIntegrityService>( - base::BindRepeating(&BindMediaIntegrityServiceReceiver)); + &BindMediaIntegrityServiceReceiver); } if (base::FeatureList::IsEnabled(::features::kWebPayments)) { - map->Add<payments::mojom::PaymentRequest>(base::BindRepeating( - &ForwardToJavaFrame<payments::mojom::PaymentRequest>)); + map->Add<payments::mojom::PaymentRequest>( + &ForwardToJavaFrame<payments::mojom::PaymentRequest>); } }
diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java index 2d57782..f33395c 100644 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
@@ -1055,6 +1055,7 @@ Flag.baseFeature("TimedHTMLParserBudget"), Flag.baseFeature("ServiceWorkerBackgroundUpdateForRegisteredStorageKeys"), Flag.baseFeature("ServiceWorkerBackgroundUpdateForServiceWorkerScopeCache"), + Flag.baseFeature("ServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl"), Flag.baseFeature( "ServiceWorkerBackgroundUpdateForRegisteredStorageKeysFieldTrialControlled"), Flag.baseFeature(
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 878c915..283f04b 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn
@@ -5517,6 +5517,7 @@ "//components/exo/wayland:ui_controls_protocol_stub", "//components/manta/proto", "//components/prefs:test_support", + "//components/session_manager/core", "//components/user_education/common", "//components/user_manager:user_manager", "//components/viz/test:test_support",
diff --git a/ash/system/bluetooth/DEPS b/ash/system/bluetooth/DEPS index 03f9242..e565fc331 100644 --- a/ash/system/bluetooth/DEPS +++ b/ash/system/bluetooth/DEPS
@@ -1,3 +1,9 @@ include_rules = [ "+services/device/public", ] + +specific_include_rules = { + "bluetooth_feature_pod_controller_unittest\\.cc": [ + "+components/session_manager/core/session_manager.h", + ] +}
diff --git a/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc b/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc index b4646ed9..605bddc5 100644 --- a/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc +++ b/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc
@@ -33,6 +33,7 @@ #include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "chromeos/constants/chromeos_features.h" +#include "components/session_manager/core/session_manager.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/view.h" @@ -145,9 +146,9 @@ } void LockScreen() { - bluetooth_config_test_helper()->session_manager()->SessionStarted(); - bluetooth_config_test_helper()->session_manager()->SetSessionState( - session_manager::SessionState::LOCKED); + auto* session_manager = session_manager::SessionManager::Get(); + session_manager->SessionStarted(); + session_manager->SetSessionState(session_manager::SessionState::LOCKED); base::RunLoop().RunUntilIdle(); }
diff --git a/ash/system/session/logout_button_tray_unittest.cc b/ash/system/session/logout_button_tray_unittest.cc index e85442749..fe7e52ff 100644 --- a/ash/system/session/logout_button_tray_unittest.cc +++ b/ash/system/session/logout_button_tray_unittest.cc
@@ -11,6 +11,7 @@ #include "ash/shelf/shelf.h" #include "ash/shell.h" #include "ash/system/session/logout_confirmation_controller.h" +#include "ash/system/session/logout_confirmation_dialog.h" #include "ash/system/status_area_widget.h" #include "ash/system/user/login_status.h" #include "ash/test/ash_test_base.h" @@ -18,10 +19,9 @@ #include "ash/test_shell_delegate.h" #include "base/test/metrics/user_action_tester.h" #include "components/prefs/pref_service.h" -#include "ui/events/base_event_utils.h" #include "ui/views/accessibility/view_accessibility.h" #include "ui/views/controls/button/md_text_button.h" -#include "ui/views/test/button_test_api.h" +#include "ui/views/widget/widget.h" namespace ash { namespace { @@ -37,22 +37,11 @@ ~LogoutButtonTrayTest() override = default; - // NoSessionAshTestBase: - void SetUp() override { - NoSessionAshTestBase::SetUp(); - SimulateUserLogin({kUserEmail}); - } - LogoutButtonTray* tray() { return Shell::GetPrimaryRootWindowController() ->GetStatusAreaWidget() ->logout_button_tray_for_testing(); } - - PrefService* pref_service() { - return Shell::Get()->session_controller()->GetUserPrefServiceForUser( - AccountId::FromUserEmail(kUserEmail)); - } }; TEST_F(LogoutButtonTrayTest, Visibility) { @@ -62,10 +51,15 @@ EXPECT_FALSE(button->GetVisible()); // Button is not visible after simulated login. + SimulateUserLogin({kUserEmail}); EXPECT_FALSE(button->GetVisible()); + PrefService* pref_service = + Shell::Get()->session_controller()->GetUserPrefServiceForUser( + AccountId::FromUserEmail(kUserEmail)); + // Setting the pref makes the button visible. - pref_service()->SetBoolean(prefs::kShowLogoutButtonInTray, true); + pref_service->SetBoolean(prefs::kShowLogoutButtonInTray, true); EXPECT_TRUE(button->GetVisible()); // Locking the screen hides the button. @@ -77,68 +71,96 @@ EXPECT_TRUE(button->GetVisible()); // Resetting the pref hides the button. - pref_service()->SetBoolean(prefs::kShowLogoutButtonInTray, false); + pref_service->SetBoolean(prefs::kShowLogoutButtonInTray, false); EXPECT_FALSE(button->GetVisible()); } -// TODO(crbug.com/1491544): Test is flaky. -TEST_F(LogoutButtonTrayTest, DISABLED_ButtonPressed) { +TEST_F(LogoutButtonTrayTest, ButtonPressedSignOutImmediately) { + ASSERT_TRUE(tray()); + views::MdTextButton* const button = tray()->button_for_test(); + TestSessionControllerClient* const session_client = + GetSessionControllerClient(); + + // Sign out immediately when duration is zero. + auto pref_service = TestPrefServiceProvider::CreateUserPrefServiceSimple(); + pref_service->SetBoolean(prefs::kShowLogoutButtonInTray, true); + pref_service->SetInteger(prefs::kLogoutDialogDurationMs, 0); + SimulateUserLogin({kUserEmail}, std::nullopt, std::move(pref_service)); + + EXPECT_EQ(0, session_client->request_sign_out_count()); + EXPECT_EQ(0, Shell::Get() + ->logout_confirmation_controller() + ->confirm_logout_count_for_test()); + + LeftClickOn(button); + session_client->FlushForTest(); + EXPECT_EQ(1, session_client->request_sign_out_count()); + EXPECT_EQ(0, Shell::Get() + ->logout_confirmation_controller() + ->confirm_logout_count_for_test()); +} + +TEST_F(LogoutButtonTrayTest, ButtonPressedShowConfirmationDialog) { + ASSERT_TRUE(tray()); + views::MdTextButton* const button = tray()->button_for_test(); + TestSessionControllerClient* const session_client = + GetSessionControllerClient(); + + // Call |LogoutConfirmationController::ConfirmLogout| when duration is + // non-zero. + auto pref_service = TestPrefServiceProvider::CreateUserPrefServiceSimple(); + pref_service->SetBoolean(prefs::kShowLogoutButtonInTray, true); + pref_service->SetInteger(prefs::kLogoutDialogDurationMs, 1000); + SimulateUserLogin({kUserEmail}, std::nullopt, std::move(pref_service)); + + EXPECT_EQ(0, session_client->request_sign_out_count()); + EXPECT_EQ(0, Shell::Get() + ->logout_confirmation_controller() + ->confirm_logout_count_for_test()); + + LeftClickOn(button); + session_client->FlushForTest(); + EXPECT_EQ(0, session_client->request_sign_out_count()); + EXPECT_EQ(1, Shell::Get() + ->logout_confirmation_controller() + ->confirm_logout_count_for_test()); + + LogoutConfirmationDialog* dialog = + Shell::Get()->logout_confirmation_controller()->dialog_for_testing(); + ASSERT_TRUE(dialog); + dialog->GetWidget()->CloseNow(); + ASSERT_FALSE( + Shell::Get()->logout_confirmation_controller()->dialog_for_testing()); +} + +TEST_F(LogoutButtonTrayTest, ButtonPressedInDemoSession) { constexpr char kUserAction[] = "DemoMode.ExitFromShelf"; + base::UserActionTester user_action_tester; ASSERT_TRUE(tray()); views::MdTextButton* const button = tray()->button_for_test(); TestSessionControllerClient* const session_client = GetSessionControllerClient(); - base::UserActionTester user_action_tester; - const ui::MouseEvent event(ui::EventType::kMousePressed, gfx::Point(), - gfx::Point(), ui::EventTimeForNow(), 0, 0); - PrefService* const pref_service = - Shell::Get()->session_controller()->GetUserPrefServiceForUser( - AccountId::FromUserEmail(kUserEmail)); - SimulateUserLogin({kUserEmail}); - EXPECT_EQ(0, session_client->request_sign_out_count()); - EXPECT_EQ(0, user_action_tester.GetActionCount(kUserAction)); - EXPECT_EQ(0, Shell::Get() - ->logout_confirmation_controller() - ->confirm_logout_count_for_test()); - - // Sign out immediately when duration is zero. + // Sign out immediately and record user action when duration is zero + // and it is demo session. + auto pref_service = TestPrefServiceProvider::CreateUserPrefServiceSimple(); + pref_service->SetBoolean(prefs::kShowLogoutButtonInTray, true); pref_service->SetInteger(prefs::kLogoutDialogDurationMs, 0); - views::test::ButtonTestApi button_test(button); - button_test.NotifyClick(event); - session_client->FlushForTest(); - EXPECT_EQ(1, session_client->request_sign_out_count()); - EXPECT_EQ(0, user_action_tester.GetActionCount(kUserAction)); - EXPECT_EQ(0, Shell::Get() - ->logout_confirmation_controller() - ->confirm_logout_count_for_test()); - - // Call |LogoutConfirmationController::ConfirmLogout| when duration is - // non-zero. - pref_service->SetInteger(prefs::kLogoutDialogDurationMs, 1000); - button_test.NotifyClick(event); - session_client->FlushForTest(); - EXPECT_EQ(1, session_client->request_sign_out_count()); - EXPECT_EQ(0, user_action_tester.GetActionCount(kUserAction)); - EXPECT_EQ(1, Shell::Get() - ->logout_confirmation_controller() - ->confirm_logout_count_for_test()); - - // Sign out immediately and record user action when duration is zero and it is - // demo session. - pref_service->SetInteger(prefs::kLogoutDialogDurationMs, 0); + SimulateUserLogin({kUserEmail}, std::nullopt, std::move(pref_service)); session_client->SetIsDemoSession(); - button_test.NotifyClick(event); + + LeftClickOn(button); session_client->FlushForTest(); - EXPECT_EQ(2, session_client->request_sign_out_count()); + EXPECT_EQ(1, session_client->request_sign_out_count()); EXPECT_EQ(1, user_action_tester.GetActionCount(kUserAction)); - EXPECT_EQ(1, Shell::Get() + EXPECT_EQ(0, Shell::Get() ->logout_confirmation_controller() ->confirm_logout_count_for_test()); } TEST_F(LogoutButtonTrayTest, AccessibleName) { + SimulateUserLogin({kUserEmail}); { ui::AXNodeData node_data; tray()->GetViewAccessibility().GetAccessibleNodeData(&node_data);
diff --git a/ash/test/DEPS b/ash/test/DEPS index 1eef436d..0834e711 100644 --- a/ash/test/DEPS +++ b/ash/test/DEPS
@@ -7,9 +7,12 @@ ] specific_include_rules = { - "ash_test_helper\.cc": [ + "ash_test_helper\\.cc": [ "+ash/host", "+chromeos/ash/components/fwupd", "+chromeos/ash/components/login/login_state", ], + "ash_test_helper\\.h": [ + "+components/session_manager/core/session_manager.h", + ] }
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index f210167..e94f39e1 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc
@@ -47,6 +47,7 @@ #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "ash/wm/window_positioner.h" #include "ash/wm/work_area_insets.h" +#include "base/check_deref.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" @@ -129,8 +130,19 @@ AshTestBase::AshTestBase( std::unique_ptr<base::test::TaskEnvironment> task_environment) - : task_environment_(std::move(task_environment)) { - RegisterLocalStatePrefs(local_state_.registry(), true); + : task_environment_(std::move(task_environment)), + owned_local_state_(std::make_unique<TestingPrefServiceSimple>()), + local_state_(owned_local_state_.get()) { + CHECK(local_state_); + RegisterLocalStatePrefs(owned_local_state_->registry(), true); +} + +AshTestBase::AshTestBase( + std::unique_ptr<base::test::TaskEnvironment> task_environment, + TestingPrefServiceSimple* local_state) + : task_environment_(std::move(task_environment)), + local_state_(local_state) { + CHECK(local_state_); } AshTestBase::~AshTestBase() {
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index 9640c3e..9da8ad13 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h
@@ -20,6 +20,7 @@ #include "ash/wm/desks/desks_util.h" #include "ash/wm/overview/overview_types.h" #include "base/compiler_specific.h" +#include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/traits_bag.h" @@ -97,6 +98,11 @@ explicit AshTestBase( std::unique_ptr<base::test::TaskEnvironment> task_environment); + // In addition, a subclass may pass a TestingPrefServiceSimple to be used in + // the shell. `local_state` must be non-null and outlive `this`. + AshTestBase(std::unique_ptr<base::test::TaskEnvironment> task_environment, + TestingPrefServiceSimple* local_state); + AshTestBase(const AshTestBase&) = delete; AshTestBase& operator=(const AshTestBase&) = delete; @@ -305,7 +311,10 @@ base::test::TaskEnvironment* task_environment() { return task_environment_.get(); } - TestingPrefServiceSimple* local_state() { return &local_state_; } + + // Always returns a non-null pointer. + TestingPrefServiceSimple* local_state() { return local_state_.get(); } + AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); } // Returns nullptr before SetUp() is called. @@ -406,8 +415,11 @@ // subclasses may elect to provide their own. std::unique_ptr<base::test::TaskEnvironment> task_environment_; + // Used only if no TestingPrefServiceSimple is provided to ctor. + std::unique_ptr<TestingPrefServiceSimple> owned_local_state_; + // A pref service used for local state. - TestingPrefServiceSimple local_state_; + raw_ptr<TestingPrefServiceSimple> local_state_; // A helper class to take screen shots then compare with benchmarks. Set by // `PrepareForPixelDiffTest()`.
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h index a648e2d..4ca038d 100644 --- a/ash/test/ash_test_helper.h +++ b/ash/test/ash_test_helper.h
@@ -23,6 +23,7 @@ #include "base/types/pass_key.h" #include "chromeos/ash/components/system/fake_statistics_provider.h" #include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "components/session_manager/core/session_manager.h" #include "ui/aura/test/aura_test_helper.h" class BrowserWithTestWindowTest; @@ -220,6 +221,7 @@ std::make_unique<base::test::ScopedCommandLine>(); std::unique_ptr<system::ScopedFakeStatisticsProvider> statistics_provider_ = std::make_unique<system::ScopedFakeStatisticsProvider>(); + session_manager::SessionManager session_manager_; std::unique_ptr<TestPrefServiceProvider> prefs_provider_; std::unique_ptr<TestNotifierSettingsController> notifier_settings_controller_ =
diff --git a/base/profiler/thread_group_profiler_unittest.cc b/base/profiler/thread_group_profiler_unittest.cc index 637895ce..6eaf4085 100644 --- a/base/profiler/thread_group_profiler_unittest.cc +++ b/base/profiler/thread_group_profiler_unittest.cc
@@ -148,7 +148,8 @@ ThreadGroupProfiler::SetClient( std::make_unique<MockThreadGroupProfilerClient>()); profiler_ = std::make_unique<ThreadGroupProfiler>( - ThreadPool::CreateSequencedTaskRunner({}), /*thread_group_type=*/0, + ThreadPool::CreateSequencedTaskRunner({MayBlock()}), + /*thread_group_type=*/0, std::make_unique<MockPeriodicSamplingScheduler>(kTimeToNextCollection), GetMockProfilerFactory(sampling_profilers_, sampling_profilers_created_));
diff --git a/base/tracing/protos/chrome_track_event.proto b/base/tracing/protos/chrome_track_event.proto index cb9fb1e..0201eee 100644 --- a/base/tracing/protos/chrome_track_event.proto +++ b/base/tracing/protos/chrome_track_event.proto
@@ -801,7 +801,6 @@ TASK_TYPE_MACHINE_LEARNING = 86; TASK_TYPE_MAIN_THREAD_TASK_QUEUE_V8_BEST_EFFORT = 87; TASK_TYPE_INTERNAL_AUTOFILL = 88; - TASK_TYPE_BACK_FORWARD_CACHE_POSTED_MESSAGE = 89; } enum FrameType {
diff --git a/build/action_helpers.py b/build/action_helpers.py index 48d8ae5..7399716 100644 --- a/build/action_helpers.py +++ b/build/action_helpers.py
@@ -103,7 +103,8 @@ path = pathlib.Path(depfile_path) path.parent.mkdir(parents=True, exist_ok=True) - path.write_text(''.join(sb)) + with atomic_output(str(path), mode='w', encoding='utf-8') as w: + w.write(''.join(sb)) def parse_gn_list(value):
diff --git a/build/android/pylib/symbols/deobfuscator.py b/build/android/pylib/symbols/deobfuscator.py index 7106098..6544f5f9 100644 --- a/build/android/pylib/symbols/deobfuscator.py +++ b/build/android/pylib/symbols/deobfuscator.py
@@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import logging import os from pylib import constants @@ -18,8 +19,17 @@ class Deobfuscator(ExpensiveLineTransformer): def __init__(self, mapping_path): - super().__init__(_PROCESS_START_TIMEOUT, _MINIMUM_TIMEOUT, - _PER_LINE_TIMEOUT) + min_timeout = _MINIMUM_TIMEOUT + for k in os.environ: + if k.startswith('DRONE') or k.startswith('SKYLAB'): + logging.warning( + 'Likely running in a CPU-limited context due to the presence of ' + 'the %s env var. Setting min timeout for Deobfuscator to 10x.', k) + # TODO(crbug.com/421235960): Remove this if the CPU constraints are + # removed. + min_timeout = 10 * _MINIMUM_TIMEOUT + break + super().__init__(_PROCESS_START_TIMEOUT, min_timeout, _PER_LINE_TIMEOUT) script_path = os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android', 'stacktrace', 'java_deobfuscate.py') self._command = [script_path, mapping_path]
diff --git a/build/config/siso/mojo.star b/build/config/siso/mojo.star index 92d46b9..9a28d634 100644 --- a/build/config/siso/mojo.star +++ b/build/config/siso/mojo.star
@@ -29,10 +29,8 @@ { "name": "mojo/mojom_parser", "command_prefix": platform.python_bin + " ../../mojo/public/tools/mojom/mojom_parser.py", - # TODO: b/285078792 - Win cross compile on Linux worker doesn't work with input_root_absolute_path=true. "remote": runtime.os != "windows", "canonicalize_dir": True, - "input_root_absolute_path": True, "timeout": "2m", "output_local": True, "platform_ref": platform_ref,
diff --git a/chrome/VERSION b/chrome/VERSION index 4dca3276..d90b134a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=140 MINOR=0 -BUILD=7271 +BUILD=7272 PATCH=0
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java index 4419ac33..680d8ba1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java
@@ -5,6 +5,7 @@ package org.chromium.chrome.browser.dom_distiller; import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; import org.chromium.base.ObserverList; import org.chromium.base.UserData; @@ -18,6 +19,7 @@ import org.chromium.content_public.browser.NavigationHandle; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; +import org.chromium.url.GURL; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -72,20 +74,26 @@ /** Cached results from the last result from native. */ private boolean mIsDistillable; + /** Track the last result URL. Used to avoid resetting distillability data on the same page. */ + private @Nullable GURL mDistillationResultUrl; + private boolean mIsLast; private boolean mIsLongArticle; private boolean mIsMobileOptimized; + /** Creates a TabDistillabilityProvider for the given tab. */ public static void createForTab(Tab tab) { assert get(tab) == null; tab.getUserDataHost().setUserData(USER_DATA_KEY, new TabDistillabilityProvider(tab)); } + /** Returns the TabDistillabilityProvider for the given tab if it exists. */ public static @Nullable TabDistillabilityProvider get(Tab tab) { return tab.getUserDataHost().getUserData(USER_DATA_KEY); } - private TabDistillabilityProvider(Tab tab) { + @VisibleForTesting + TabDistillabilityProvider(Tab tab) { mTab = tab; mObserverList = new ObserverList<>(); resetState(); @@ -136,6 +144,7 @@ */ private void resetState() { mDistillabilityDetermined = false; + mDistillationResultUrl = null; mIsDistillable = false; mIsLast = false; mIsLongArticle = false; @@ -169,6 +178,8 @@ boolean isLast, boolean isLongArticle, boolean isMobileOptimized) { + // TODO(crbug.com/428168653): Plumb the url through this callback. + mDistillationResultUrl = mTab.getUrl(); mIsDistillable = isDistillable; mIsLast = isLast; mIsLongArticle = isLongArticle; @@ -179,11 +190,11 @@ for (DistillabilityObserver o : mObserverList) { o.onIsPageDistillableResult(mTab, mIsDistillable, mIsLast, mIsMobileOptimized); } + recordContentClassificationMetric(); } @Override public void onContentChanged(Tab tab) { - recordContentClassificationMetric(); resetState(); } @@ -194,9 +205,13 @@ } @Override + public void onDidStartNavigationInPrimaryMainFrame(Tab tab, NavigationHandle navigation) { + resetStateIfUrlHasChanged(tab); + } + + @Override public void onDidFinishNavigationInPrimaryMainFrame(Tab tab, NavigationHandle navigation) { - recordContentClassificationMetric(); - resetState(); + resetStateIfUrlHasChanged(tab); } @Override @@ -208,4 +223,11 @@ mWebContents = null; resetState(); } + + private void resetStateIfUrlHasChanged(Tab tab) { + // If the current URL matches the distillation result URL, then the result is still fresh. + // TODO(crbug.com/428169696): Use more relaxed matching to avoid #fragments resetting this. + if (tab.getUrl().equals(mDistillationResultUrl)) return; + resetState(); + } }
diff --git a/chrome/android/junit/BUILD.gn b/chrome/android/junit/BUILD.gn index 89cdbd6..a6486ec 100644 --- a/chrome/android/junit/BUILD.gn +++ b/chrome/android/junit/BUILD.gn
@@ -1259,6 +1259,7 @@ "src/org/chromium/chrome/browser/display_cutout/DisplayCutoutControllerTest.java", "src/org/chromium/chrome/browser/dom_distiller/ReaderModeManagerTest.java", "src/org/chromium/chrome/browser/dom_distiller/ReaderModeToolbarButtonControllerTest.java", + "src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProviderTest.java", "src/org/chromium/chrome/browser/feed/FeedActionDelegateImplTest.java", "src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollectorUnitTest.java", "src/org/chromium/chrome/browser/feedback/FeedFeedbackCollectorTest.java", @@ -1309,6 +1310,7 @@ deps = [ ":chrome_junit_tests_helper", "//chrome/browser/privacy:privacy_preference_manager_java", + "//components/dom_distiller/content/browser/android:dom_distiller_content_java", ] } }
diff --git a/chrome/android/junit/DEPS b/chrome/android/junit/DEPS index afc0a158..78228b0 100644 --- a/chrome/android/junit/DEPS +++ b/chrome/android/junit/DEPS
@@ -3,7 +3,6 @@ "+chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/privacy_sandbox/TrackingProtectionSnackbarController.java", "+chrome/browser/android/lifecycle", - "+components/image_fetcher", "+chrome/browser/ui/android/appmenu/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuDelegate.java", "+chrome/android/java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java", "+chrome/browser/commerce/android/java", @@ -32,8 +31,9 @@ "+components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification", "+components/data_sharing/test_support/android/java/src/org/chromium/components/data_sharing", "+components/data_sharing/public/android/java/src/org/chromium/components/data_sharing", - "+components/dom_distiller/core", + "+components/dom_distiller", "+components/feature_engagement/public/android", + "+components/image_fetcher", "+components/offline_items_collection/core/android/java/src", "+components/omnibox/browser/android/java/src/org/chromium/components/omnibox", "+components/payments/content/android/ui/java/src/org/chromium/components/payments/ui",
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProviderTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProviderTest.java new file mode 100644 index 0000000..a9400be --- /dev/null +++ b/chrome/android/junit/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProviderTest.java
@@ -0,0 +1,101 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.dom_distiller; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.components.dom_distiller.content.DistillablePageUtils; +import org.chromium.components.dom_distiller.content.DistillablePageUtilsJni; +import org.chromium.content_public.browser.WebContents; +import org.chromium.url.GURL; + +/** Unit tests for {@link TabDistillabilityProvider}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class TabDistillabilityProviderTest { + + private static final GURL URL_1 = new GURL("http://www.test1.com"); + private static final GURL URL_2 = new GURL("http://www.test2.com"); + + @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private DistillablePageUtils.Natives mDistillablePageUtilsJni; + @Mock private Tab mTab; + @Mock private WebContents mWebContents; + @Mock private Profile mProfile; + + private TabDistillabilityProvider mProvider; + + @Before + public void setUp() { + DistillablePageUtilsJni.setInstanceForTesting(mDistillablePageUtilsJni); + + when(mTab.getWebContents()).thenReturn(mWebContents); + when(mTab.getProfile()).thenReturn(mProfile); + when(mTab.getUrl()).thenReturn(URL_1); + when(mProfile.isOffTheRecord()).thenReturn(false); + + mProvider = new TabDistillabilityProvider(mTab); + verify(mDistillablePageUtilsJni).setDelegate(any(), eq(mProvider)); + // Reset the mocks so tests don't have to take this registration into account. + Mockito.reset(mDistillablePageUtilsJni); + } + + @Test + public void finishNavigationWithSameUrlDoesNothing() { + // Setup the distillation result, and verify loading the same page is a no-op. + mProvider.onIsPageDistillableResult( + /* isDistillable= */ true, + /* isLast= */ true, + /* isLongArticle= */ false, + /* isMobileOptimized= */ true); + assertTrue(mProvider.isDistillabilityDetermined()); + + mProvider.onDidFinishNavigationInPrimaryMainFrame(mTab, null); + assertTrue(mProvider.isDistillabilityDetermined()); + } + + @Test + public void finishNavigationOnUrlWithDifferentResult() { + // Setup the distillation result, and verify loading the different page invalidates. + mProvider.onIsPageDistillableResult( + /* isDistillable= */ true, + /* isLast= */ true, + /* isLongArticle= */ false, + /* isMobileOptimized= */ true); + assertTrue(mProvider.isDistillabilityDetermined()); + + when(mTab.getUrl()).thenReturn(URL_2); + mProvider.onDidFinishNavigationInPrimaryMainFrame(mTab, null); + assertFalse(mProvider.isDistillabilityDetermined()); + } + + @Test + public void differentWebContentsReregistersDelegate() { + WebContents webContents = Mockito.mock(WebContents.class); + when(mTab.getWebContents()).thenReturn(webContents); + when(mTab.getUrl()).thenReturn(URL_2); + mProvider.onDidFinishNavigationInPrimaryMainFrame(mTab, null); + verify(mDistillablePageUtilsJni).setDelegate(any(), eq(mProvider)); + } +}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 76a78c4c..f924efb 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -1392,7 +1392,6 @@ "resource_coordinator/tab_helper.cc", "resource_coordinator/tab_helper.h", "resource_coordinator/tab_load_tracker.cc", - "resource_coordinator/tab_load_tracker.h", "resource_coordinator/tab_memory_metrics_reporter.cc", "resource_coordinator/tab_memory_metrics_reporter.h", "resource_coordinator/time.cc", @@ -3263,8 +3262,6 @@ "segmentation_platform/android/contextual_page_action_controller_android.cc", "segmentation_platform/android/home_modules_ranking_helper.cc", "segmentation_platform/android/segmentation_platform_service_factory_android.cc", - "segmentation_platform/client_util/tab_data_collection_util.cc", - "segmentation_platform/client_util/tab_data_collection_util.h", "serial/android/serial_bridge.cc", "serial/android/web_serial_chooser_android.cc", "sessions/session_restore_android.cc", @@ -4192,11 +4189,9 @@ "repost_form_warning_controller.cc", "repost_form_warning_controller.h", "resource_coordinator/decision_details.cc", - "resource_coordinator/decision_details.h", "resource_coordinator/discard_metrics_lifecycle_unit_observer.cc", "resource_coordinator/discard_metrics_lifecycle_unit_observer.h", "resource_coordinator/lifecycle_unit.cc", - "resource_coordinator/lifecycle_unit.h", "resource_coordinator/lifecycle_unit_base.cc", "resource_coordinator/lifecycle_unit_base.h", "resource_coordinator/lifecycle_unit_observer.cc", @@ -4396,6 +4391,7 @@ "//chrome/browser/performance_manager/public/user_tuning", "//chrome/browser/performance_manager/user_tuning", "//chrome/browser/policy:path_parser", + "//chrome/browser/resource_coordinator", "//chrome/browser/screen_ai:prefs", "//chrome/browser/screen_ai:screen_ai_install_state", "//chrome/browser/screen_ai:screen_ai_service_router_factory", @@ -4427,6 +4423,7 @@ "//chrome/browser/ui/media_router", "//chrome/browser/ui/media_router:impl", "//chrome/browser/ui/page_action:icon_type", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/privacy_sandbox", "//chrome/browser/ui/search", @@ -9134,6 +9131,7 @@ "//chrome/browser/autofill:test_support", "//chrome/browser/media/webrtc", "//chrome/browser/profiles:profile", + "//chrome/browser/resource_coordinator", "//chrome/browser/safe_browsing:test_support", "//chrome/browser/ui:test_support", ]
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 37b3d822..66f597ed 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -1542,7 +1542,7 @@ nullptr}, }; -const FeatureEntry::FeatureParam kOmniboxToolbeltAggressive[] = { +const FeatureEntry::FeatureParam kOmniboxToolbeltZeroAndTypedInputse[] = { {"KeepToolbeltAfterInput", "true"}, {"AlwaysIncludeLensAction", "false"}, {"ShowLensActionOnNonNtp", "true"}, @@ -1556,10 +1556,25 @@ {"ShowTabsActionOnNonNtp", "true"}, {"ShowTabsActionOnNtp", "true"}, }; +const FeatureEntry::FeatureParam kOmniboxToolbeltZeroInputs[] = { + {"KeepToolbeltAfterInput", "false"}, + {"AlwaysIncludeLensAction", "false"}, + {"ShowLensActionOnNonNtp", "true"}, + {"ShowLensActionOnNtp", "true"}, + {"ShowAiModeActionOnNonNtp", "true"}, + {"ShowAiModeActionOnNtp", "true"}, + {"ShowHistoryActionOnNonNtp", "true"}, + {"ShowHistoryActionOnNtp", "true"}, + {"ShowBookmarksActionOnNonNtp", "true"}, + {"ShowBookmarksActionOnNtp", "true"}, + {"ShowTabsActionOnNonNtp", "true"}, + {"ShowTabsActionOnNtp", "true"}, +}; const FeatureEntry::FeatureVariation kOmniboxToolbeltVariations[] = { - {"Aggressive - zero & typed inputs; all actions.", - kOmniboxToolbeltAggressive, std::size(kOmniboxToolbeltAggressive), - nullptr}}; + {"Zero & typed inputs; all actions.", kOmniboxToolbeltZeroAndTypedInputse, + std::size(kOmniboxToolbeltZeroAndTypedInputse), nullptr}, + {"Zero inputs; all actions.", kOmniboxToolbeltZeroInputs, + std::size(kOmniboxToolbeltZeroInputs), nullptr}}; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) @@ -10501,6 +10516,13 @@ FEATURE_VALUE_TYPE(switches::kEnableExtensionsExplicitBrowserSignin)}, #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) && BUILDFLAG(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_HLS_DEMUXER) + {"enable-hls-playback", flag_descriptions::kEnableHlsPlaybackName, + flag_descriptions::kEnableHlsPlaybackDescription, + kOsMac | kOsWin | kOsLinux | kOsCrOS, + FEATURE_VALUE_TYPE(media::kBuiltInHlsPlayer)}, +#endif + #if BUILDFLAG(IS_CHROMEOS) {"flex-firmware-update", flag_descriptions::kFlexFirmwareUpdateName, flag_descriptions::kFlexFirmwareUpdateDescription, kOsCrOS, @@ -11267,11 +11289,6 @@ kDatasharingVariations, "Enabled")}, - {"collaboration-automotive", - flag_descriptions::kCollaborationAutomotiveName, - flag_descriptions::kCollaborationAutomotiveDescription, kOsAll, - FEATURE_VALUE_TYPE(data_sharing::features::kCollaborationAutomotive)}, - {"collaboration-entreprise-v2", flag_descriptions::kCollaborationEntrepriseV2Name, flag_descriptions::kCollaborationEntrepriseV2Description, kOsAll, @@ -12716,9 +12733,23 @@ {"offer-migration-to-dice-users", flag_descriptions::kOfferMigrationToDiceUsersName, flag_descriptions::kOfferMigrationToDiceUsersDescription, kOsDesktop, - FEATURE_VALUE_TYPE(switches::kOfferMigrationToDiceUsers)} + FEATURE_VALUE_TYPE(switches::kOfferMigrationToDiceUsers)}, #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_CHROMEOS) + {"autofill-enable-buy-now-pay-later-for-externally-linked-klarna", + flag_descriptions:: + kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaName, + flag_descriptions:: + kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaDescription, + kOsDesktop, + FEATURE_VALUE_TYPE( + autofill::features:: + kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarna)}, +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) + // Add new entries above this line. // NOTE: Adding a new flag requires adding a corresponding entry to enum
diff --git a/chrome/browser/ash/app_list/chat/BUILD.gn b/chrome/browser/ash/app_list/chat/BUILD.gn deleted file mode 100644 index f96c3d0..0000000 --- a/chrome/browser/ash/app_list/chat/BUILD.gn +++ /dev/null
@@ -1,22 +0,0 @@ -# Copyright 2024 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos) - -static_library("chat") { - sources = [ - "chat_controller.cc", - "chat_controller.h", - ] - - public_deps = [ "//chrome/browser:browser_public_dependencies" ] - - deps = [ - "//base", - "//chrome/browser/ash/app_list/search", - "//chrome/browser/profiles:profile", - ] -}
diff --git a/chrome/browser/ash/app_list/chat/DEPS b/chrome/browser/ash/app_list/chat/DEPS deleted file mode 100644 index dec911f..0000000 --- a/chrome/browser/ash/app_list/chat/DEPS +++ /dev/null
@@ -1,19 +0,0 @@ -include_rules = [ - # ChromeOS should not depend on //chrome. See //docs/chromeos/code.md for - # details. - "-chrome", - - # This directory is in //chrome, which violates the rule above. Allow this - # directory to #include its own files. - "+chrome/browser/ash/app_list/chat", - - # Existing dependencies within //chrome. There is an active effort to - # refactor //chrome/browser/ash to break these dependencies; see b/332804822. - # Whenever possible, avoid adding new //chrome dependencies to this list. - # - # Files residing in certain directories (e.g., //chrome/browser) are listed - # individually. Other dependencies within //chrome are listed on a per- - # directory basis. See //tools/chromeos/gen_deps.sh for details. - "+chrome/browser/ash/app_list/search", - "+chrome/browser/profiles", -]
diff --git a/chrome/browser/ash/app_list/chat/chat_controller.cc b/chrome/browser/ash/app_list/chat/chat_controller.cc deleted file mode 100644 index ba04422..0000000 --- a/chrome/browser/ash/app_list/chat/chat_controller.cc +++ /dev/null
@@ -1,19 +0,0 @@ -// Copyright 2023 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ash/app_list/chat/chat_controller.h" - -#include "chrome/browser/profiles/profile.h" - -// TODO(b/268140386): This file is a work in progress. - -namespace app_list { - -ChatController::ChatController(Profile* profile) : profile_(profile) { - DCHECK(profile_); -} - -ChatController::~ChatController() = default; - -} // namespace app_list
diff --git a/chrome/browser/ash/app_list/chat/chat_controller.h b/chrome/browser/ash/app_list/chat/chat_controller.h deleted file mode 100644 index 50a312a..0000000 --- a/chrome/browser/ash/app_list/chat/chat_controller.h +++ /dev/null
@@ -1,32 +0,0 @@ -// Copyright 2023 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_ASH_APP_LIST_CHAT_CHAT_CONTROLLER_H_ -#define CHROME_BROWSER_ASH_APP_LIST_CHAT_CHAT_CONTROLLER_H_ - -#include "base/memory/raw_ptr.h" -#include "chrome/browser/ash/app_list/search/chrome_search_result.h" -#include "chrome/browser/ash/app_list/search/search_provider.h" - -class Profile; - -// TODO(b/268140386): This file is a work in progress. - -namespace app_list { - -class ChatController { - public: - explicit ChatController(Profile* profile); - ~ChatController(); - - ChatController(const ChatController&) = delete; - ChatController& operator=(const ChatController&) = delete; - - private: - raw_ptr<Profile> profile_; -}; - -} // namespace app_list - -#endif // CHROME_BROWSER_ASH_APP_LIST_CHAT_CHAT_CONTROLLER_H_
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/BUILD.gn b/chrome/browser/ash/child_accounts/parent_access_code/BUILD.gn index e6956e25..d9559d7 100644 --- a/chrome/browser/ash/child_accounts/parent_access_code/BUILD.gn +++ b/chrome/browser/ash/child_accounts/parent_access_code/BUILD.gn
@@ -79,6 +79,7 @@ "//chrome/browser/profiles:profile", "//chrome/test:test_support_ui", "//components/account_id", + "//components/account_id:test_support", "//components/prefs", "//components/user_manager", "//content/test:test_support",
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc index f6b7b8d..8597c8bf 100644 --- a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc +++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
@@ -20,6 +20,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h" #include "components/account_id/account_id.h" +#include "components/account_id/account_id_literal.h" #include "components/prefs/pref_service.h" #include "components/user_manager/test_helper.h" #include "components/user_manager/user_manager.h" @@ -37,6 +38,10 @@ int failure_count = 0; }; +constexpr auto kRegularUserAccountId = + AccountId::Literal::FromUserEmailGaiaId("regular@gmail.com", + GaiaId::Literal("test-gaia")); + // ParentAccessServiceObserver implementation used for tests. class TestParentAccessServiceObserver : public ParentAccessService::Observer { public: @@ -76,6 +81,12 @@ ~ParentAccessServiceTest() override = default; + void SetUpLocalStatePrefService(PrefService* local_state) override { + MixinBasedInProcessBrowserTest::SetUpLocalStatePrefService(local_state); + user_manager::TestHelper::RegisterPersistedUser(*local_state, + kRegularUserAccountId); + } + void SetUpOnMainThread() override { ASSERT_NO_FATAL_FAILURE(GetTestAccessCodeValues(&test_values_)); ParentAccessService::Get().AddObserver(test_observer_.get()); @@ -294,12 +305,7 @@ IN_PROC_BROWSER_TEST_F(ParentAccessServiceTest, RegularDeviceOwner_IsApprovalRequired) { - auto* user_manager = user_manager::UserManager::Get(); - const AccountId regular_user = - AccountId::FromUserEmailGaiaId("regular@gmail.com", GaiaId("test-gaia")); - ASSERT_TRUE( - user_manager::TestHelper(user_manager).AddRegularUser(regular_user)); - user_manager->SetOwnerId(regular_user); + user_manager::UserManager::Get()->SetOwnerId(kRegularUserAccountId); // No configuration available - reauth does not require PAC. // Login screen.
diff --git a/chrome/browser/ash/file_manager/file_manager_policy_browsertest.cc b/chrome/browser/ash/file_manager/file_manager_policy_browsertest.cc index 6909eb0..330c54d3 100644 --- a/chrome/browser/ash/file_manager/file_manager_policy_browsertest.cc +++ b/chrome/browser/ash/file_manager/file_manager_policy_browsertest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/files/file_util.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc b/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc index 67f1d24..b56866e4 100644 --- a/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc +++ b/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "ash/test/ash_test_helper.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/power_monitor_test.h" @@ -26,6 +25,7 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/prefs/testing_pref_service.h" +#include "components/session_manager/core/session_manager.h" #include "components/user_manager/known_user.h" #include "components/user_manager/scoped_user_manager.h" #include "components/user_manager/test_helper.h" @@ -90,8 +90,7 @@ ScopedTestingLocalState local_state_{TestingBrowserProcess::GetGlobal()}; std::unique_ptr<user_manager::KnownUser> known_user_; - // `AshTestHelper` makes sure that `SessionManager` is set up in these tests. - ash::AshTestHelper ash_test_helper_; + std::optional<session_manager::SessionManager> session_manager_; }; OfflineSigninLimiterTest::OfflineSigninLimiterTest() = default; @@ -120,6 +119,7 @@ } void OfflineSigninLimiterTest::SetUp() { + session_manager_.emplace(); fake_user_manager_.Reset(std::make_unique<ash::FakeChromeUserManager>()); profile_ = std::make_unique<TestingProfile>(); known_user_ = std::make_unique<user_manager::KnownUser>(local_state_.Get()); @@ -128,6 +128,8 @@ void OfflineSigninLimiterTest::TearDown() { DestroyLimiter(); profile_.reset(); + session_manager_.reset(); + fake_user_manager_.Reset(); } FakeChromeUserManager* OfflineSigninLimiterTest::GetFakeChromeUserManager() {
diff --git a/chrome/browser/ash/login/users/BUILD.gn b/chrome/browser/ash/login/users/BUILD.gn index 5e923835..c8c374a 100644 --- a/chrome/browser/ash/login/users/BUILD.gn +++ b/chrome/browser/ash/login/users/BUILD.gn
@@ -89,6 +89,8 @@ sources = [ "fake_chrome_user_manager.cc", "fake_chrome_user_manager.h", + "scoped_account_id_annotator.cc", + "scoped_account_id_annotator.h", ] public_deps = [ @@ -101,10 +103,12 @@ deps = [ ":users", "//ash/constants", + "//chrome/browser", "//chrome/browser:browser_process", "//chrome/browser/ash/login/users/default_user_image", "//chrome/browser/ash/profiles", "//chrome/browser/ui", + "//chromeos/ash/components/browser_context_helper", "//chromeos/ash/components/login/login_state", "//chromeos/ash/components/settings", "//components/user_manager:common",
diff --git a/chrome/browser/ash/login/users/scoped_account_id_annotator.cc b/chrome/browser/ash/login/users/scoped_account_id_annotator.cc new file mode 100644 index 0000000..c0f83e0 --- /dev/null +++ b/chrome/browser/ash/login/users/scoped_account_id_annotator.cc
@@ -0,0 +1,30 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ash/login/users/scoped_account_id_annotator.h" + +#include "base/check.h" +#include "base/check_deref.h" +#include "chrome/browser/profiles/profile_manager.h" +#include "chromeos/ash/components/browser_context_helper/annotated_account_id.h" + +namespace ash { + +ScopedAccountIdAnnotator::ScopedAccountIdAnnotator( + ProfileManager* profile_manager, + const AccountId& account_id) + : account_id_(account_id) { + observation_.Observe(profile_manager); +} + +ScopedAccountIdAnnotator::~ScopedAccountIdAnnotator() = default; + +void ScopedAccountIdAnnotator::OnProfileCreationStarted(Profile* profile) { + // Guarantee that only one Profile can have the AccountId. + CHECK(account_id_.has_value()); + ash::AnnotatedAccountId::Set(profile, *account_id_); + account_id_.reset(); +} + +} // namespace ash
diff --git a/chrome/browser/ash/login/users/scoped_account_id_annotator.h b/chrome/browser/ash/login/users/scoped_account_id_annotator.h new file mode 100644 index 0000000..e43334a8 --- /dev/null +++ b/chrome/browser/ash/login/users/scoped_account_id_annotator.h
@@ -0,0 +1,43 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_ASH_LOGIN_USERS_SCOPED_ACCOUNT_ID_ANNOTATOR_H_ +#define CHROME_BROWSER_ASH_LOGIN_USERS_SCOPED_ACCOUNT_ID_ANNOTATOR_H_ + +#include <optional> + +#include "base/scoped_observation.h" +#include "chrome/browser/profiles/profile_manager_observer.h" +#include "components/account_id/account_id.h" + +class Profile; +class ProfileManager; + +namespace ash { + +// In production, ProfileUserManagerController annotates AccountId via +// ProfileManagerObserver::OnProfileCreationStarted. However, the calculation +// of the AccountId is inferred from the directory path, which is slightly +// inconvenient for writing tests. This registers the same observer, and +// annotates the `account_id` passed to the constructor to the Profile +// created in the given `profile_manager`. +class ScopedAccountIdAnnotator : public ProfileManagerObserver { + public: + ScopedAccountIdAnnotator(ProfileManager* profile_manager, + const AccountId& account_id); + ~ScopedAccountIdAnnotator() override; + + // ProfileManagerObserver: + void OnProfileCreationStarted(Profile* profile) override; + + private: + std::optional<AccountId> account_id_; + + base::ScopedObservation<ProfileManager, ProfileManagerObserver> observation_{ + this}; +}; + +} // namespace ash + +#endif // CHROME_BROWSER_ASH_LOGIN_USERS_SCOPED_ACCOUNT_ID_ANNOTATOR_H_
diff --git a/chrome/browser/ash/sharesheet/drive_share_action.cc b/chrome/browser/ash/sharesheet/drive_share_action.cc index fd8bc4f9..e2c5a47 100644 --- a/chrome/browser/ash/sharesheet/drive_share_action.cc +++ b/chrome/browser/ash/sharesheet/drive_share_action.cc
@@ -49,7 +49,10 @@ intent->drive_share_url.value(), ash::NewWindowDelegate::OpenUrlFrom::kUserInteraction, NewWindowDelegate::Disposition::kNewForegroundTab); - controller_->CloseBubble(::sharesheet::SharesheetResult::kSuccess); + // Opening URL may close the bubble. + if (controller_) { + controller_->CloseBubble(::sharesheet::SharesheetResult::kSuccess); + } } void DriveShareAction::OnClosing(
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index bd5a2bf7..b799732 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd
@@ -30,9 +30,11 @@ <structure type="lottie" name="IDR_WEBAUTHN_GPM_PIN_LOCKED_LIGHT" file="resources/webauthn/gpm_pin_locked_light.json" compress="brotli" /> <structure type="lottie" name="IDR_WEBAUTHN_GPM_PIN_LOCKED_DARK" file="resources/webauthn/gpm_pin_locked_dark.json" compress="brotli" /> - <!-- Autofill Lottie resources--> + <!-- Autofill Lottie resources --> <structure type="lottie" name="IDR_SAVE_PASSWORD_LOTTIE" file="resources/autofill/autofill_save_password.json" compress="brotli"/> <structure type="lottie" name="IDR_SAVE_ADDRESS_LOTTIE" file="resources/autofill/autofill_save_address.json" compress="brotli"/> + <structure type="lottie" name="IDR_VIRTUAL_CARD_ENROLL_DIALOG_LOTTIE" file="resources/autofill/autofill_virtual_card_enroll_dialog.json" compress="brotli"/> + <structure type="lottie" name="IDR_AUTOFILL_AI_FFR_BANNER_LOTTIE" file="resources/autofill/autofill_ai_ffr_banner.json" compress="brotli"/> </if> </structures>
diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc index caa95f09..d22d01de 100644 --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -430,26 +430,25 @@ void PopulateChromeFrameBinders( mojo::BinderMapWithContext<content::RenderFrameHost*>* map, content::RenderFrameHost* render_frame_host) { - map->Add<image_annotation::mojom::Annotator>( - base::BindRepeating(&BindImageAnnotator)); + map->Add<image_annotation::mojom::Annotator>(&BindImageAnnotator); map->Add<blink::mojom::AnchorElementMetricsHost>( - base::BindRepeating(&NavigationPredictor::Create)); + &NavigationPredictor::Create); map->Add<blink::mojom::LCPCriticalPathPredictorHost>( - base::BindRepeating(&predictors::LCPCriticalPathPredictorHost::Create)); + &predictors::LCPCriticalPathPredictorHost::Create); map->Add<dom_distiller::mojom::DistillabilityService>( - base::BindRepeating(&BindDistillabilityService)); + &BindDistillabilityService); map->Add<dom_distiller::mojom::DistillerJavaScriptService>( - base::BindRepeating(&BindDistillerJavaScriptService)); + &BindDistillerJavaScriptService); map->Add<prerender::mojom::NoStatePrefetchCanceler>( - base::BindRepeating(&BindNoStatePrefetchCanceler)); + &BindNoStatePrefetchCanceler); map->Add<blink::mojom::NoStatePrefetchProcessor>( - base::BindRepeating(&BindNoStatePrefetchProcessor)); + &BindNoStatePrefetchProcessor); auto* pm_registry = performance_manager::PerformanceManagerRegistry::GetInstance(); @@ -458,10 +457,9 @@ } map->Add<translate::mojom::ContentTranslateDriver>( - base::BindRepeating(&translate::BindContentTranslateDriver)); + &translate::BindContentTranslateDriver); - map->Add<optimization_guide::mojom::ModelBroker>( - base::BindRepeating(&BindModelBroker)); + map->Add<optimization_guide::mojom::ModelBroker>(&BindModelBroker); if (!base::FeatureList::IsEnabled(blink::features::kLanguageDetectionAPI)) { // When the feature is enabled, the driver is bound by @@ -471,82 +469,78 @@ // // TODO(https://crbug.com/354069716): Remove this when the flag is removed. map->Add<language_detection::mojom::ContentLanguageDetectionDriver>( - base::BindRepeating(&translate::BindContentLanguageDetectionDriver)); + &translate::BindContentLanguageDetectionDriver); } - map->Add<blink::mojom::CredentialManager>( - base::BindRepeating(&BindCredentialManager)); + map->Add<blink::mojom::CredentialManager>(&BindCredentialManager); map->Add<chrome::mojom::OpenSearchDescriptionDocumentHandler>( base::BindRepeating( &SearchEngineTabHelper::BindOpenSearchDescriptionDocumentHandler)); #if BUILDFLAG(IS_ANDROID) - map->Add<blink::mojom::InstalledAppProvider>(base::BindRepeating( - &ForwardToJavaFrame<blink::mojom::InstalledAppProvider>)); - map->Add<payments::mojom::DigitalGoodsFactory>(base::BindRepeating( - &ForwardToJavaFrame<payments::mojom::DigitalGoodsFactory>)); + map->Add<blink::mojom::InstalledAppProvider>( + &ForwardToJavaFrame<blink::mojom::InstalledAppProvider>); + map->Add<payments::mojom::DigitalGoodsFactory>( + &ForwardToJavaFrame<payments::mojom::DigitalGoodsFactory>); #if defined(BROWSER_MEDIA_CONTROLS_MENU) - map->Add<blink::mojom::MediaControlsMenuHost>(base::BindRepeating( - &ForwardToJavaFrame<blink::mojom::MediaControlsMenuHost>)); + map->Add<blink::mojom::MediaControlsMenuHost>( + &ForwardToJavaFrame<blink::mojom::MediaControlsMenuHost>); #endif map->Add<chrome::mojom::OfflinePageAutoFetcher>( - base::BindRepeating(&offline_pages::OfflinePageAutoFetcher::Create)); + &offline_pages::OfflinePageAutoFetcher::Create); if (base::FeatureList::IsEnabled(features::kWebPayments)) { - map->Add<payments::mojom::PaymentRequest>(base::BindRepeating( - &ForwardToJavaFrame<payments::mojom::PaymentRequest>)); + map->Add<payments::mojom::PaymentRequest>( + &ForwardToJavaFrame<payments::mojom::PaymentRequest>); } #if BUILDFLAG(ENABLE_UNHANDLED_TAP) map->Add<blink::mojom::UnhandledTapNotifier>( - base::BindRepeating(&BindUnhandledTapWebContentsObserver)); + &BindUnhandledTapWebContentsObserver); #endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) #else map->Add<blink::mojom::BadgeService>( - base::BindRepeating(&badging::BadgeManager::BindFrameReceiverIfAllowed)); + &badging::BadgeManager::BindFrameReceiverIfAllowed); map->Add<blink::mojom::PersistentRendererPrefsService>( - base::BindRepeating(&PersistentRendererPrefsManager::BindFrameReceiver)); + &PersistentRendererPrefsManager::BindFrameReceiver); if (base::FeatureList::IsEnabled(features::kWebPayments)) { - map->Add<payments::mojom::PaymentRequest>( - base::BindRepeating(&payments::CreatePaymentRequest)); + map->Add<payments::mojom::PaymentRequest>(&payments::CreatePaymentRequest); } if (base::FeatureList::IsEnabled(blink::features::kWebAppInstallation) && !render_frame_host->GetParentOrOuterDocument()) { map->Add<blink::mojom::WebInstallService>( - base::BindRepeating(&web_app::WebInstallServiceImpl::CreateIfAllowed)); + &web_app::WebInstallServiceImpl::CreateIfAllowed); } #endif #if BUILDFLAG(IS_CHROMEOS) - map->Add<payments::mojom::DigitalGoodsFactory>(base::BindRepeating( - &apps::DigitalGoodsFactoryImpl::BindDigitalGoodsFactory)); + map->Add<payments::mojom::DigitalGoodsFactory>( + &apps::DigitalGoodsFactoryImpl::BindDigitalGoodsFactory); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - map->Add<blink::mojom::ShareService>( - base::BindRepeating(&ShareServiceImpl::Create)); + map->Add<blink::mojom::ShareService>(&ShareServiceImpl::Create); #endif #if BUILDFLAG(IS_ANDROID) - map->Add<blink::mojom::ShareService>(base::BindRepeating( - &ForwardToJavaWebContents<blink::mojom::ShareService>)); + map->Add<blink::mojom::ShareService>( + &ForwardToJavaWebContents<blink::mojom::ShareService>); #endif - map->Add<network_hints::mojom::NetworkHintsHandler>( - base::BindRepeating(&BindNetworkHintsHandler)); + map->Add<network_hints::mojom::NetworkHintsHandler>(&BindNetworkHintsHandler); map->Add<media::mojom::OnDeviceSpeechRecognition>( - base::BindRepeating(&BindOnDeviceSpeechRecognitionHandler)); + &BindOnDeviceSpeechRecognitionHandler); #if BUILDFLAG(ENABLE_SPEECH_SERVICE) map->Add<media::mojom::SpeechRecognitionContext>( - base::BindRepeating(&BindSpeechRecognitionContextHandler)); + &BindSpeechRecognitionContextHandler); map->Add<media::mojom::SpeechRecognitionClientBrowserInterface>( - base::BindRepeating(&BindSpeechRecognitionClientBrowserInterfaceHandler)); + &BindSpeechRecognitionClientBrowserInterfaceHandler); map->Add<media::mojom::SpeechRecognitionRecognizerClient>( - base::BindRepeating(&BindSpeechRecognitionRecognizerClientHandler)); + &BindSpeechRecognitionRecognizerClientHandler); #if BUILDFLAG(IS_WIN) map->Add<media::mojom::MediaFoundationRendererNotifier>( - base::BindRepeating(&BindMediaFoundationRendererNotifierHandler)); + &BindMediaFoundationRendererNotifierHandler); #endif #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) @@ -558,40 +552,39 @@ // to register it for them because a non-primary main frame could become a // primary main frame at a later time (eg. a prerendered page). map->Add<blink::mojom::SubAppsService>( - base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed)); + &web_app::SubAppsServiceImpl::CreateIfAllowed); } - map->Add<screen_ai::mojom::ScreenAIAnnotator>( - base::BindRepeating(&BindScreenAIAnnotator)); + map->Add<screen_ai::mojom::ScreenAIAnnotator>(&BindScreenAIAnnotator); map->Add<screen_ai::mojom::Screen2xMainContentExtractor>( - base::BindRepeating(&BindScreen2xMainContentExtractor)); + &BindScreen2xMainContentExtractor); #endif #if BUILDFLAG(IS_WIN) map->Add<media::mojom::MediaFoundationPreferences>( - base::BindRepeating(&BindMediaFoundationPreferences)); + &BindMediaFoundationPreferences); #endif #if BUILDFLAG(ENABLE_PRINT_PREVIEW) map->Add<blink::mojom::WebPrintingService>( - base::BindRepeating(&printing::CreateWebPrintingServiceForFrame)); + &printing::CreateWebPrintingServiceForFrame); #endif #if BUILDFLAG(IS_ANDROID) if (base::FeatureList::IsEnabled(blink::features::kPaymentLinkDetection)) { map->Add<payments::facilitated::mojom::PaymentLinkHandler>( - base::BindRepeating(&BindPaymentLinkHandler)); + &BindPaymentLinkHandler); } #endif #if BUILDFLAG(ENABLE_SPELLCHECK) - map->Add<spellcheck::mojom::SpellCheckHost>(base::BindRepeating( + map->Add<spellcheck::mojom::SpellCheckHost>( [](content::RenderFrameHost* frame_host, mojo::PendingReceiver<spellcheck::mojom::SpellCheckHost> receiver) { SpellCheckHostChromeImpl::Create( frame_host->GetProcess()->GetDeprecatedID(), std::move(receiver)); - })); + }); #endif // BUILDFLAG(ENABLE_SPELLCHECK) }
diff --git a/chrome/browser/chrome_browser_interface_binders_webui.cc b/chrome/browser/chrome_browser_interface_binders_webui.cc index 65c075dd..a9aec43f 100644 --- a/chrome/browser/chrome_browser_interface_binders_webui.cc +++ b/chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -783,7 +783,7 @@ // TODO(crbug.com/398926117): Create a generic mechanism for these interfaces. map->Add<metrics_reporter::mojom::PageMetricsHost>( - base::BindRepeating(&BindMetricsReporterService)); + &BindMetricsReporterService); #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc index 47cdccd..944e5c37 100644 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -368,8 +368,7 @@ mojo::BinderMapWithContext< const content::ServiceWorkerVersionBaseInfo&>* map) { #if !BUILDFLAG(IS_ANDROID) - map->Add<blink::mojom::BadgeService>( - base::BindRepeating(&BindBadgeServiceForServiceWorker)); + map->Add<blink::mojom::BadgeService>(&BindBadgeServiceForServiceWorker); #endif #if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc index 5c55db3..2eb24c22 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
@@ -11,6 +11,7 @@ #include "chrome/browser/extensions/extension_api_unittest.h" #include "chrome/common/chrome_constants.h" #include "chrome/test/base/testing_profile.h" +#include "components/session_manager/core/session_manager.h" #include "components/session_manager/session_manager_types.h" #include "extensions/browser/api_test_utils.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/contextual_cueing/contextual_cueing_service.cc b/chrome/browser/contextual_cueing/contextual_cueing_service.cc index 03ef62f7..b4217136 100644 --- a/chrome/browser/contextual_cueing/contextual_cueing_service.cc +++ b/chrome/browser/contextual_cueing/contextual_cueing_service.cc
@@ -298,11 +298,12 @@ #endif } -void ContextualCueingService::GetContextualGlicZeroStateSuggestions( - content::WebContents* web_contents, - bool is_fre, - std::optional<std::vector<std::string>> supported_tools, - GlicSuggestionsCallback callback) { +void ContextualCueingService:: + GetContextualGlicZeroStateSuggestionsForFocusedTab( + content::WebContents* web_contents, + bool is_fre, + std::optional<std::vector<std::string>> supported_tools, + GlicSuggestionsCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!base::FeatureList::IsEnabled(kGlicZeroStateSuggestions)) {
diff --git a/chrome/browser/contextual_cueing/contextual_cueing_service.h b/chrome/browser/contextual_cueing/contextual_cueing_service.h index 2a03804..3a79c6d 100644 --- a/chrome/browser/contextual_cueing/contextual_cueing_service.h +++ b/chrome/browser/contextual_cueing/contextual_cueing_service.h
@@ -87,8 +87,9 @@ void PrepareToFetchContextualGlicZeroStateSuggestions( content::WebContents* web_contents); - // Returns zero state suggestions for GLIC. Virtual for testing. - virtual void GetContextualGlicZeroStateSuggestions( + // Returns zero state suggestions for focused tab for GLIC. Virtual for + // testing. + virtual void GetContextualGlicZeroStateSuggestionsForFocusedTab( content::WebContents* web_contents, bool is_fre, std::optional<std::vector<std::string>> supported_tools,
diff --git a/chrome/browser/contextual_cueing/contextual_cueing_service_browsertest.cc b/chrome/browser/contextual_cueing/contextual_cueing_service_browsertest.cc index d6de282..6b6db5c 100644 --- a/chrome/browser/contextual_cueing/contextual_cueing_service_browsertest.cc +++ b/chrome/browser/contextual_cueing/contextual_cueing_service_browsertest.cc
@@ -92,7 +92,7 @@ ContextualCueingService* service = ContextualCueingServiceFactory::GetForProfile( Profile::FromBrowserContext(web_contents()->GetBrowserContext())); - service->GetContextualGlicZeroStateSuggestions( + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents(), /*is_fre=*/false, /*supported_tools=*/{}, std::move(callback_)); } @@ -152,9 +152,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/true, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/true, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectUniqueSample( @@ -181,7 +181,7 @@ ASSERT_TRUE(ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/optimization_guide/zss_page.html"))); - service->GetContextualGlicZeroStateSuggestions( + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents, /*is_fre=*/true, /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); @@ -285,9 +285,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/false, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/false, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectTotalCount( "ContextualCueing.ZeroStateSuggestions.ContextExtractionDone", 0); @@ -313,9 +313,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/false, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/false, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectTotalCount( "ContextualCueing.ZeroStateSuggestions.ContextExtractionDone", 0); @@ -363,9 +363,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/false, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/false, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectUniqueSample( "ContextualCueing.ZeroStateSuggestions.ContextExtractionDone", true, 1); @@ -456,9 +456,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/true, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/true, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectTotalCount( @@ -486,9 +486,9 @@ base::test::TestFuture<std::optional<std::vector<std::string>>> future; auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - service->GetContextualGlicZeroStateSuggestions(web_contents, /*is_fre=*/true, - /*supported_tools=*/{}, - future.GetCallback()); + service->GetContextualGlicZeroStateSuggestionsForFocusedTab( + web_contents, /*is_fre=*/true, + /*supported_tools=*/{}, future.GetCallback()); ASSERT_TRUE(future.Wait()); histogram_tester.ExpectTotalCount(
diff --git a/chrome/browser/contextual_cueing/contextual_cueing_service_unittest.cc b/chrome/browser/contextual_cueing/contextual_cueing_service_unittest.cc index da582bd..28d3fbc 100644 --- a/chrome/browser/contextual_cueing/contextual_cueing_service_unittest.cc +++ b/chrome/browser/contextual_cueing/contextual_cueing_service_unittest.cc
@@ -495,7 +495,7 @@ InitializeContextualCueingService(); base::test::TestFuture<std::optional<std::vector<std::string>>> future; - service()->GetContextualGlicZeroStateSuggestions( + service()->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents(), /*is_fre=*/false, /*supported_tools=*/std::nullopt, future.GetCallback()); @@ -510,7 +510,7 @@ InitializeContextualCueingService(); base::test::TestFuture<std::optional<std::vector<std::string>>> future; - service()->GetContextualGlicZeroStateSuggestions( + service()->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents(), /*is_fre=*/false, /*supported_tools=*/{}, future.GetCallback()); @@ -534,7 +534,7 @@ InitializeContextualCueingService(); base::test::TestFuture<std::optional<std::vector<std::string>>> future; - service()->GetContextualGlicZeroStateSuggestions( + service()->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents(), /*is_fre=*/false, std::vector<std::string>({"tool"}), future.GetCallback()); @@ -567,7 +567,7 @@ std::move(tools_pref)); base::test::TestFuture<std::optional<std::vector<std::string>>> future; - service()->GetContextualGlicZeroStateSuggestions( + service()->GetContextualGlicZeroStateSuggestionsForFocusedTab( web_contents(), /*is_fre=*/false, /*supported_tools=*/std::nullopt, future.GetCallback());
diff --git a/chrome/browser/contextual_cueing/mock_contextual_cueing_service.h b/chrome/browser/contextual_cueing/mock_contextual_cueing_service.h index aa52e393..e0772c75 100644 --- a/chrome/browser/contextual_cueing/mock_contextual_cueing_service.h +++ b/chrome/browser/contextual_cueing/mock_contextual_cueing_service.h
@@ -33,7 +33,7 @@ PrepareToFetchContextualGlicZeroStateSuggestions, (content::WebContents*)); MOCK_METHOD(void, - GetContextualGlicZeroStateSuggestions, + GetContextualGlicZeroStateSuggestionsForFocusedTab, (content::WebContents*, bool, std::optional<std::vector<std::string>>,
diff --git a/chrome/browser/enterprise/watermark/settings.cc b/chrome/browser/enterprise/watermark/settings.cc index 4b5f8aa2..e5cbea9 100644 --- a/chrome/browser/enterprise/watermark/settings.cc +++ b/chrome/browser/enterprise/watermark/settings.cc
@@ -34,11 +34,12 @@ return std::clamp(percent_value, 0, 100) * 255 / 100; } -// Helper function to get opacity to Skia alpha value (0-255). +// Helper function to get opacity as a Skia alpha value (0-255) +// from a percentage value (0-100) // Order of precedence: -// 1. Command-line flag (0-100 percent). -// 2. PrefService preference (0-100 percent). -// 3. Default percentage value (0-100 percent). +// 1. The command line flag value takes precedence over any other settings. +// 2. If the user has set a custom value in the PrefService, that value is used. +// 3. Otherwise, the default value stored in the PrefService is returned. int GetOpacity(const PrefService* prefs, const char* pref_name, const char* cmd_opacity_percent_flag) { @@ -100,8 +101,6 @@ return SkColorSetA(kBaseOutlineRGB, alpha); } -// Returns the font size for the watermark. -// This function always returns a positive integer (>= 1). int GetFontSize(const PrefService* prefs) { if (!base::FeatureList::IsEnabled( enterprise_watermark::kEnableWatermarkCustomization)) {
diff --git a/chrome/browser/enterprise/watermark/settings.h b/chrome/browser/enterprise/watermark/settings.h index c183a664..f189d84 100644 --- a/chrome/browser/enterprise/watermark/settings.h +++ b/chrome/browser/enterprise/watermark/settings.h
@@ -16,6 +16,8 @@ int GetDefaultFontSize(); SkColor GetFillColor(const PrefService* prefs); SkColor GetOutlineColor(const PrefService* prefs); +// Returns the font size for the watermark. +// This function always returns a positive integer (>= 1). int GetFontSize(const PrefService* prefs); } // namespace enterprise_watermark
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 79b1b7c4..b64dca9 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn
@@ -116,6 +116,7 @@ "api/identity/web_auth_flow_info_bar_delegate.h", "api/instance_id/instance_id_api.cc", "api/instance_id/instance_id_api.h", + "api/management/chrome_management_api_delegate.cc", "api/management/chrome_management_api_delegate.h", "api/messaging/chrome_messaging_delegate.cc", "api/messaging/chrome_messaging_delegate.h", @@ -898,6 +899,7 @@ "//chrome/browser/prefs:util", "//chrome/browser/profiles:profile_util", "//chrome/browser/reading_list", + "//chrome/browser/resource_coordinator", "//chrome/browser/search", "//chrome/browser/search/background", "//chrome/browser/search_engine_choice",
diff --git a/chrome/browser/extensions/api/document_scan/document_scan_apitest.cc b/chrome/browser/extensions/api/document_scan/document_scan_apitest.cc index 5f7f60c..30610f3b 100644 --- a/chrome/browser/extensions/api/document_scan/document_scan_apitest.cc +++ b/chrome/browser/extensions/api/document_scan/document_scan_apitest.cc
@@ -7,6 +7,7 @@ #include "base/auto_reset.h" #include "base/check_deref.h" #include "base/containers/map_util.h" +#include "base/files/file_util.h" #include "base/notreached.h" #include "base/path_service.h" #include "chrome/browser/extensions/api/document_scan/document_scan_api_handler.h"
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc new file mode 100644 index 0000000..c0b3158 --- /dev/null +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -0,0 +1,90 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/extensions/api/management/chrome_management_api_delegate.h" + +#include <memory> +#include <string> +#include <utility> + +#include "chrome/browser/extensions/chrome_extension_function_details.h" +#include "chrome/browser/extensions/extension_tab_util.h" +#include "extensions/browser/api/management/management_api.h" +#include "extensions/common/extension_urls.h" +#include "extensions/common/mojom/context_type.mojom.h" + +namespace extensions { +namespace { + +class ManagementUninstallFunctionUninstallDialogDelegate + : public ExtensionUninstallDialog::Delegate, + public UninstallDialogDelegate { + public: + ManagementUninstallFunctionUninstallDialogDelegate( + ManagementUninstallFunctionBase* function, + const Extension* target_extension, + bool show_programmatic_uninstall_ui) + : function_(function) { + ChromeExtensionFunctionDetails details(function); + extension_uninstall_dialog_ = ExtensionUninstallDialog::Create( + Profile::FromBrowserContext(function->browser_context()), + details.GetNativeWindowForUI(), this); + bool uninstall_from_webstore = + (function->extension() && + function->extension()->id() == kWebStoreAppId) || + function->source_url().DomainIs( + extension_urls::GetNewWebstoreLaunchURL().host()); + UninstallSource source; + UninstallReason reason; + if (uninstall_from_webstore) { + source = UNINSTALL_SOURCE_CHROME_WEBSTORE; + reason = UNINSTALL_REASON_CHROME_WEBSTORE; + } else if (function->source_context_type() == mojom::ContextType::kWebUi) { + source = UNINSTALL_SOURCE_CHROME_EXTENSIONS_PAGE; + // TODO: Update this to a new reason; it shouldn't be lumped in with + // other uninstalls if it's from the chrome://extensions page. + reason = UNINSTALL_REASON_MANAGEMENT_API; + } else { + source = UNINSTALL_SOURCE_EXTENSION; + reason = UNINSTALL_REASON_MANAGEMENT_API; + } + if (show_programmatic_uninstall_ui) { + extension_uninstall_dialog_->ConfirmUninstallByExtension( + target_extension, function->extension(), reason, source); + } else { + extension_uninstall_dialog_->ConfirmUninstall(target_extension, reason, + source); + } + } + + ManagementUninstallFunctionUninstallDialogDelegate( + const ManagementUninstallFunctionUninstallDialogDelegate&) = delete; + ManagementUninstallFunctionUninstallDialogDelegate& operator=( + const ManagementUninstallFunctionUninstallDialogDelegate&) = delete; + + ~ManagementUninstallFunctionUninstallDialogDelegate() override = default; + + // ExtensionUninstallDialog::Delegate implementation. + void OnExtensionUninstallDialogClosed(bool did_start_uninstall, + const std::u16string& error) override { + function_->OnExtensionUninstallDialogClosed(did_start_uninstall, error); + } + + private: + raw_ptr<ManagementUninstallFunctionBase> function_; + std::unique_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; +}; + +} // namespace + +std::unique_ptr<UninstallDialogDelegate> +ChromeManagementAPIDelegate::UninstallFunctionDelegate( + ManagementUninstallFunctionBase* function, + const Extension* target_extension, + bool show_programmatic_uninstall_ui) const { + return std::make_unique<ManagementUninstallFunctionUninstallDialogDelegate>( + function, target_extension, show_programmatic_uninstall_ui); +} + +} // namespace extensions
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate_android.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate_android.cc index ff875c0..2ca0375 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate_android.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate_android.cc
@@ -51,22 +51,6 @@ return nullptr; } -std::unique_ptr<UninstallDialogDelegate> -ChromeManagementAPIDelegate::UninstallFunctionDelegate( - ManagementUninstallFunctionBase* function, - const Extension* target_extension, - bool show_programmatic_uninstall_ui) const { - // TODO(crbug.com/410932770): Show an uninstall dialog. For now, just - // uninstall the extension. - auto* registrar = ExtensionRegistrar::Get(function->browser_context()); - std::u16string error; - registrar->UninstallExtension(target_extension->id(), - UNINSTALL_REASON_MANAGEMENT_API, &error); - function->OnExtensionUninstallDialogClosed(/*did_start_uninstall=*/true, - error); - return nullptr; -} - bool ChromeManagementAPIDelegate::CreateAppShortcutFunctionDelegate( ManagementCreateAppShortcutFunction* function, const Extension* extension,
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate_nonandroid.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate_nonandroid.cc index 91fd30d..3568c4a 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate_nonandroid.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate_nonandroid.cc
@@ -133,65 +133,6 @@ weak_factory_{this}; }; -class ManagementUninstallFunctionUninstallDialogDelegate - : public ExtensionUninstallDialog::Delegate, - public UninstallDialogDelegate { - public: - ManagementUninstallFunctionUninstallDialogDelegate( - ManagementUninstallFunctionBase* function, - const Extension* target_extension, - bool show_programmatic_uninstall_ui) - : function_(function) { - ChromeExtensionFunctionDetails details(function); - extension_uninstall_dialog_ = ExtensionUninstallDialog::Create( - Profile::FromBrowserContext(function->browser_context()), - details.GetNativeWindowForUI(), this); - bool uninstall_from_webstore = - (function->extension() && - function->extension()->id() == kWebStoreAppId) || - function->source_url().DomainIs( - extension_urls::GetNewWebstoreLaunchURL().host()); - UninstallSource source; - UninstallReason reason; - if (uninstall_from_webstore) { - source = UNINSTALL_SOURCE_CHROME_WEBSTORE; - reason = UNINSTALL_REASON_CHROME_WEBSTORE; - } else if (function->source_context_type() == mojom::ContextType::kWebUi) { - source = UNINSTALL_SOURCE_CHROME_EXTENSIONS_PAGE; - // TODO: Update this to a new reason; it shouldn't be lumped in with - // other uninstalls if it's from the chrome://extensions page. - reason = UNINSTALL_REASON_MANAGEMENT_API; - } else { - source = UNINSTALL_SOURCE_EXTENSION; - reason = UNINSTALL_REASON_MANAGEMENT_API; - } - if (show_programmatic_uninstall_ui) { - extension_uninstall_dialog_->ConfirmUninstallByExtension( - target_extension, function->extension(), reason, source); - } else { - extension_uninstall_dialog_->ConfirmUninstall(target_extension, reason, - source); - } - } - - ManagementUninstallFunctionUninstallDialogDelegate( - const ManagementUninstallFunctionUninstallDialogDelegate&) = delete; - ManagementUninstallFunctionUninstallDialogDelegate& operator=( - const ManagementUninstallFunctionUninstallDialogDelegate&) = delete; - - ~ManagementUninstallFunctionUninstallDialogDelegate() override = default; - - // ExtensionUninstallDialog::Delegate implementation. - void OnExtensionUninstallDialogClosed(bool did_start_uninstall, - const std::u16string& error) override { - function_->OnExtensionUninstallDialogClosed(did_start_uninstall, error); - } - - private: - raw_ptr<ManagementUninstallFunctionBase> function_; - std::unique_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; -}; - void OnGenerateAppForLinkCompleted( ManagementGenerateAppForLinkFunction* function, const webapps::AppId& app_id, @@ -446,15 +387,6 @@ web_contents, browser_context, extension, std::move(callback)); } -std::unique_ptr<UninstallDialogDelegate> -ChromeManagementAPIDelegate::UninstallFunctionDelegate( - ManagementUninstallFunctionBase* function, - const Extension* target_extension, - bool show_programmatic_uninstall_ui) const { - return std::make_unique<ManagementUninstallFunctionUninstallDialogDelegate>( - function, target_extension, show_programmatic_uninstall_ui); -} - bool ChromeManagementAPIDelegate::CreateAppShortcutFunctionDelegate( ManagementCreateAppShortcutFunction* function, const Extension* extension,
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc b/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc index 46971344..c3fe04863 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc
@@ -17,13 +17,10 @@ namespace errors = extensions::manifest_errors; -using extensions::Extension; -using extensions::ExtensionBuilder; - +namespace extensions { namespace { -class StreamsPrivateManifestTest : public ChromeManifestTest { -}; +using StreamsPrivateManifestTest = ChromeManifestTest; TEST_F(StreamsPrivateManifestTest, ValidMimeTypesHandlerMIMETypes) { scoped_refptr<const Extension> extension = @@ -63,3 +60,4 @@ } } // namespace +} // namespace extensions
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index 9adaa8f2..48495fa 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -16,6 +16,7 @@ #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" +#include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -2442,7 +2443,7 @@ // TODO(crbug.com/40715657): Test is flaky on multiple platforms. IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, DISABLED_WebSocketRequest) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory())); + ASSERT_TRUE(StartWebSocketServer()); ASSERT_TRUE( RunExtensionTest("webrequest", {.extension_url = "test_websocket.html"})) << message_; @@ -2454,7 +2455,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, DISABLED_WebSocketRequestAuthRequired) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory(), true)); + ASSERT_TRUE(StartWebSocketServer(/*enable_basic_auth=*/true)); ASSERT_TRUE(RunExtensionTest("webrequest", {.extension_url = "test_websocket_auth.html"})) << message_; @@ -2464,7 +2465,7 @@ // requests. IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebSocketRequestOnWorker) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory())); + ASSERT_TRUE(StartWebSocketServer()); ASSERT_TRUE(RunExtensionTest("webrequest", {.extension_url = "test_websocket_worker.html"})) << message_; @@ -2482,7 +2483,7 @@ #endif IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebSocketCleanClose) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory())); + ASSERT_TRUE(StartWebSocketServer()); ASSERT_TRUE(RunExtensionTest( "webrequest", {.extension_url = "test_websocket_clean_close.html"})) << message_;
diff --git a/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc b/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc index f8d1888..bbcadb3 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc
@@ -171,13 +171,13 @@ // Register InputEngineManager for official Google ChromeOS 1P Input only. if (extension->id() == ash::extension_ime_util::kXkbExtensionId) { binder_map->Add<ash::ime::mojom::InputEngineManager>( - base::BindRepeating(&BindInputEngineManager)); - binder_map->Add<ash::language::mojom::LanguagePacks>(base::BindRepeating( + &BindInputEngineManager); + binder_map->Add<ash::language::mojom::LanguagePacks>( [](content::RenderFrameHost* frame_host, mojo::PendingReceiver<ash::language::mojom::LanguagePacks> - receiver) { BindLanguagePacks(std::move(receiver)); })); + receiver) { BindLanguagePacks(std::move(receiver)); }); binder_map->Add<chromeos::machine_learning::mojom::MachineLearningService>( - base::BindRepeating(&BindMachineLearningService)); + &BindMachineLearningService); } #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -195,7 +195,7 @@ #if BUILDFLAG(PLATFORM_CFM) if (chromeos::cfm::IsChromeboxForMeetingsHashedAppId( extension->hashed_id().value())) { - binder_map->Add<ash::cfm::mojom::XuCamera>(base::BindRepeating( + binder_map->Add<ash::cfm::mojom::XuCamera>( [](content::RenderFrameHost* frame_host, mojo::PendingReceiver<ash::cfm::mojom::XuCamera> receiver) { if (base::FeatureList::IsEnabled(ash::cfm::features::kXuControls)) { @@ -207,7 +207,7 @@ chromeos::cfm::mojom::DisconnectReason::kFinchDisabledCode), chromeos::cfm::mojom::DisconnectReason::kFinchDisabledMessage); } - })); + }); } #endif // BUILDFLAG(PLATFORM_CFM) @@ -248,27 +248,25 @@ // Limit the binding to EnhancedNetworkTts Extension. if (extension->id() == extension_misc::kEnhancedNetworkTtsExtensionId) { binder_map->Add<ash::enhanced_network_tts::mojom::EnhancedNetworkTts>( - base::BindRepeating( - [](content::RenderFrameHost* frame_host, - mojo::PendingReceiver< - ash::enhanced_network_tts::mojom::EnhancedNetworkTts> - receiver) { - BindEnhancedNetworkTts(frame_host->GetBrowserContext(), - std::move(receiver)); - })); + [](content::RenderFrameHost* frame_host, + mojo::PendingReceiver< + ash::enhanced_network_tts::mojom::EnhancedNetworkTts> receiver) { + BindEnhancedNetworkTts(frame_host->GetBrowserContext(), + std::move(receiver)); + }); } if (ash::RemoteAppsImpl::IsMojoPrivateApiAllowed(render_frame_host, extension)) { binder_map->Add<chromeos::remote_apps::mojom::RemoteAppsFactory>( - base::BindRepeating(&BindRemoteAppsFactory)); + &BindRemoteAppsFactory); } // Only allow specific extensions to bind CfmServiceContext if (chromeos::cfm::IsChromeboxForMeetingsHashedAppId( extension->hashed_id().value())) { binder_map->Add<chromeos::cfm::mojom::CfmServiceContext>( - base::BindRepeating(&BindCfmServiceContext)); + &BindCfmServiceContext); #if !BUILDFLAG(PLATFORM_CFM) // On first launch some older devices may be running on none-CfM @@ -276,7 +274,7 @@ // rebooted to the CfM image variant for their device. // This applies to LaCrOS and none CfM Ash builds // TODO(crbug.com/341493979): Deprecate after CfM LaCrOS migration. - binder_map->Add<ash::cfm::mojom::XuCamera>(base::BindRepeating( + binder_map->Add<ash::cfm::mojom::XuCamera>( [](content::RenderFrameHost* frame_host, mojo::PendingReceiver<ash::cfm::mojom::XuCamera> receiver) { receiver.ResetWithReason( @@ -284,15 +282,13 @@ kServiceUnavailableCode), chromeos::cfm::mojom::DisconnectReason:: kServiceUnavailableMessage); - })); + }); #endif // BUILDFLAG(PLATFORM_CFM) } #endif // BUILDFLAG(IS_CHROMEOS) - binder_map->Add<mime_handler::MimeHandlerService>( - base::BindRepeating(&BindMimeHandlerService)); - binder_map->Add<mime_handler::BeforeUnloadControl>( - base::BindRepeating(&BindBeforeUnloadControl)); + binder_map->Add<mime_handler::MimeHandlerService>(&BindMimeHandlerService); + binder_map->Add<mime_handler::BeforeUnloadControl>(&BindBeforeUnloadControl); } void PopulateChromeServiceWorkerBindersForExtension( @@ -310,10 +306,10 @@ BindGoogleTtsStream(browser_context, std::move(receiver)); }, browser_context)); - binder_map->Add<ash::language::mojom::LanguagePacks>(base::BindRepeating( + binder_map->Add<ash::language::mojom::LanguagePacks>( [](const content::ServiceWorkerVersionBaseInfo&, mojo::PendingReceiver<ash::language::mojom::LanguagePacks> - receiver) { BindLanguagePacks(std::move(receiver)); })); + receiver) { BindLanguagePacks(std::move(receiver)); }); } if (extension->id() == extension_misc::kEnhancedNetworkTtsExtensionId) {
diff --git a/chrome/browser/extensions/component_extension_browsertest.cc b/chrome/browser/extensions/component_extension_browsertest.cc index ef284da..5727b727 100644 --- a/chrome/browser/extensions/component_extension_browsertest.cc +++ b/chrome/browser/extensions/component_extension_browsertest.cc
@@ -2,14 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_browsertest.h" +#include "chrome/browser/profiles/profile.h" #include "content/public/test/browser_test.h" +#include "extensions/browser/extension_registry.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" +#include "extensions/test/test_extension_dir.h" namespace extensions { using ComponentExtensionBrowserTest = ExtensionBrowserTest; +#if BUILDFLAG(IS_CHROMEOS) // Tests that MojoJS is enabled for component extensions that need it. // Note the test currently only runs for ChromeOS because the test extension // uses `mojoPrivate` to test and `mojoPrivate` is ChromeOS only. @@ -23,5 +29,98 @@ ASSERT_TRUE(result_catcher.GetNextResult()); } +#endif // BUILDFLAG(IS_CHROMEOS) + +const ExtensionId kExtensionId = "iegclhlplifhodhkoafiokenjoapiobj"; +constexpr char kExtensionKey[] = + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjzv7dI7Ygyh67VHE1DdidudpYf8P" + "Ffv8iucWvzO+3xpF/Dm5xNo7aQhPNiEaNfHwJQ7lsp4gc+C+4bbaVewBFspTruoSJhZc5uEf" + "qxwovJwN+v1/SUFXTXQmQBv6gs0qZB4gBbl4caNQBlqrFwAMNisnu1V6UROna8rOJQ90D7Nv" + "7TCwoVPKBfVshpFjdDOTeBg4iLctO3S/06QYqaTDrwVceSyHkVkvzBY6tc6mnYX0RZu78J9i" + "L8bdqwfllOhs69cqoHHgrLdI6JdOyiuh6pBP6vxMlzSKWJ3YTNjaQTPwfOYaLMuzdl0v+Ydz" + "afIzV9zwe4Xiskk+5JNGt8b2rQIDAQAB"; + +// Tests updating a Service Worker-based component extension across a restart. +// This simulates a browser update where a component extension might change. +class ComponentExtensionServiceWorkerUpdateBrowserTest + : public ComponentExtensionBrowserTest { + public: + void WriteExtension(TestExtensionDir* dir, int version) { + constexpr char kManifestTemplate[] = + R"({ + "name": "Component SW Update Test", + "manifest_version": 3, + "version": "%d", + "background": {"service_worker": "sw.js"}, + "key": "%s" + })"; + dir->WriteManifest( + base::StringPrintf(kManifestTemplate, version, kExtensionKey)); + + constexpr char kBackgroundScriptTemplate[] = + R"(self.version = %d; + chrome.test.sendMessage(`v${self.version} ready`);)"; + dir->WriteFile(FILE_PATH_LITERAL("sw.js"), + base::StringPrintf(kBackgroundScriptTemplate, version)); + } + + int GetWorkerVersion(const ExtensionId& id) { + constexpr char kGetVersionScript[] = + "chrome.test.sendScriptResult(self.version);"; + base::Value version = ExecuteScriptInBackgroundPage(id, kGetVersionScript); + if (!version.is_int()) { + ADD_FAILURE() << "Script did not return an integer. Value: " << version; + return -1; + } + return version.GetInt(); + } + + TestExtensionDir test_dir_v1_; + TestExtensionDir test_dir_v2_; +}; + +// PRE_ test: Installs V1 of the component extension. Verifies it runs. +IN_PROC_BROWSER_TEST_F(ComponentExtensionServiceWorkerUpdateBrowserTest, + PRE_Update) { + WriteExtension(&test_dir_v1_, 1); + + // Load V1 of the component extension. + ExtensionTestMessageListener v1_ready("v1 ready"); + const Extension* extension_v1 = + LoadExtension(test_dir_v1_.UnpackedPath(), {.load_as_component = true}); + ASSERT_TRUE(extension_v1); + + // Ensure it has the correct ID and wait for it to start. + const ExtensionId id = extension_v1->id(); + ASSERT_EQ(kExtensionId, id); + ASSERT_TRUE(v1_ready.WaitUntilSatisfied()); + + // Check service worker version. + EXPECT_EQ("1", extension_v1->version().GetString()); + EXPECT_EQ(1, GetWorkerVersion(id)); +} + +// Main test: Installs V2 of the component extension. Verifies V2 runs. +IN_PROC_BROWSER_TEST_F(ComponentExtensionServiceWorkerUpdateBrowserTest, + Update) { + ASSERT_FALSE( + extension_registry()->enabled_extensions().GetByID(kExtensionId)); + WriteExtension(&test_dir_v2_, 2); + + // Load V2 of the component extension. + ExtensionTestMessageListener v2_ready("v2 ready"); + const Extension* extension_v2 = + LoadExtension(test_dir_v2_.UnpackedPath(), {.load_as_component = true}); + ASSERT_TRUE(extension_v2); + + // Ensure it has the correct ID (same as V1) and wait for it to start. + const ExtensionId id = extension_v2->id(); + EXPECT_EQ(kExtensionId, id); + ASSERT_TRUE(v2_ready.WaitUntilSatisfied()); + + // Check service worker version. + EXPECT_EQ("2", extension_v2->version().GetString()); + EXPECT_EQ(2, GetWorkerVersion(id)); +} } // namespace extensions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index fcd31c7..25af9cc 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc
@@ -41,8 +41,9 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" +#include "net/test/embedded_test_server/install_default_websocket_handlers.h" +#include "net/test/embedded_test_server/register_basic_auth_handler.h" #include "net/test/embedded_test_server/request_handler_util.h" -#include "net/test/spawned_test_server/spawned_test_server.h" #if BUILDFLAG(ENABLE_PLATFORM_APPS) #include "chrome/browser/apps/app_service/app_launch_params.h" @@ -255,18 +256,30 @@ embedded_test_server()->StartAcceptingConnections(); } +net::EmbeddedTestServer& ExtensionApiTest::GetWebSocketServer() { + if (!websocket_server_) { + websocket_server_ = std::make_unique<net::test_server::EmbeddedTestServer>( + net::test_server::EmbeddedTestServer::Type::TYPE_HTTP); + net::test_server::InstallDefaultWebSocketHandlers(websocket_server_.get()); + } + return *websocket_server_; +} + bool ExtensionApiTest::StartWebSocketServer( - const base::FilePath& root_directory, bool enable_basic_auth) { - websocket_server_ = std::make_unique<net::SpawnedTestServer>( - net::SpawnedTestServer::TYPE_WS, root_directory); - websocket_server_->set_websocket_basic_auth(enable_basic_auth); + // Initialize `websocket_server_`, if needed. + GetWebSocketServer(); + + if (enable_basic_auth) { + net::test_server::RegisterBasicAuthHandler(*websocket_server_, + /*username=*/"foo", + /*password=*/"bar"); + } if (!websocket_server_->Start()) return false; - test_config_->Set(kTestWebSocketPort, - websocket_server_->host_port_pair().port()); + test_config_->Set(kTestWebSocketPort, websocket_server_->port()); return true; }
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 298ffd0..bb4189f42 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h
@@ -5,18 +5,22 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ +#include <memory> #include <string> #include <string_view> #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "net/test/spawned_test_server/spawned_test_server.h" namespace base { class FilePath; } +namespace net::test_server { +class EmbeddedTestServer; +} + class GURL; namespace extensions { @@ -114,11 +118,14 @@ // StartEmbeddedTestServer() instead. void EmbeddedTestServerAcceptConnections(); + // Returns the test WebSocket EmbeddedTestServer. Can be used to configure + // the server before it has started. + net::test_server::EmbeddedTestServer& GetWebSocketServer(); + // Start the test WebSocket server, and store details of its state. Those // details will be available to javascript tests using // chrome.test.getConfig(). Enable HTTP basic authentication if needed. - bool StartWebSocketServer(const base::FilePath& root_directory, - bool enable_basic_auth = false); + bool StartWebSocketServer(bool enable_basic_auth = false); // Sets the additional string argument `customArg` to the test config object, // which is available to javascript tests using chrome.test.getConfig(). @@ -151,7 +158,7 @@ std::unique_ptr<base::Value::Dict> test_config_; // Hold the test WebSocket server. - std::unique_ptr<net::SpawnedTestServer> websocket_server_; + std::unique_ptr<net::test_server::EmbeddedTestServer> websocket_server_; // Test data directory shared with //extensions. base::FilePath shared_test_data_dir_;
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 0356502..38ffc0e 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -113,10 +113,16 @@ return; } +#if BUILDFLAG(ENABLE_EXTENSIONS) ExtensionManagement* extension_management = ExtensionManagementFactory::GetForBrowserContext(profile_); show_report_abuse_checkbox_ = extension_management->UpdatesFromWebstore(*extension_); +#else // BUILDFLAG(ENABLE_EXTENSIONS) + // TODO(crbug.com/404069731): Enable checkboxes on Desktop Android. Currently + // it is not supported by ModalDialogWrapper. + show_report_abuse_checkbox_ = false; +#endif // BUILDFLAG(ENABLE_EXTENSIONS) // Track that extension uninstalled externally. registry_observation_.Observe(ExtensionRegistry::Get(profile_));
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.h b/chrome/browser/extensions/extension_uninstall_dialog.h index 6f22c136..1f7124a 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.h +++ b/chrome/browser/extensions/extension_uninstall_dialog.h
@@ -61,7 +61,7 @@ virtual ~Delegate() = default; }; - // Creates the Views implementation of ExtensionUninstallDialog. The dialog + // Creates the implementation of `ExtensionUninstallDialog`. The dialog // will be modal to `parent`, or a non-modal dialog if `parent` is NULL. static std::unique_ptr<ExtensionUninstallDialog> Create(Profile* profile, gfx::NativeWindow parent, Delegate* delegate);
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index ca47069..73be6ac 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/functional/bind.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -19,10 +22,54 @@ #include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/create_websocket_handler.h" +#include "net/test/embedded_test_server/websocket_connection.h" +#include "net/test/embedded_test_server/websocket_handler.h" #include "net/test/test_data_directory.h" namespace extensions { +namespace { + +// WebSocketHandler that expects to receive a single text message if "9", and +// once it does, writes "ping" to the WebSocket 9 times, each write 250 +// milliseconds after the last one. Used by the +// "ReceivingWebSocketMessagesResetsServiceWorkerIdleTime" test. +class SendMessagesWebSocketHandler : public net::test_server::WebSocketHandler { + public: + explicit SendMessagesWebSocketHandler( + scoped_refptr<net::test_server::WebSocketConnection> connection) + : WebSocketHandler(std::move(connection)) {} + + ~SendMessagesWebSocketHandler() override = default; + + void OnTextMessage(std::string_view message) override { + EXPECT_EQ(message, "9"); + EXPECT_EQ(remaining_messages_, 9); + SendMessage(); + timer_.Start(FROM_HERE, base::Milliseconds(250), + base::BindRepeating(&SendMessagesWebSocketHandler::SendMessage, + base::Unretained(this))); + } + + private: + void SendMessage() { + CHECK_GT(remaining_messages_, 0); + CHECK(connection()); + connection()->SendTextMessage("ping"); + --remaining_messages_; + if (remaining_messages_ == 0) { + timer_.Stop(); + } + } + + int remaining_messages_ = 9; + + base::RepeatingTimer timer_; +}; + +} // namespace + class ExtensionWebSocketApiTest : public ExtensionApiTest { public: ExtensionWebSocketApiTest() = default; @@ -32,7 +79,10 @@ ExtensionApiTest::SetUpOnMainThread(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory())); + + RegisterWebSocketHandler<SendMessagesWebSocketHandler>( + &GetWebSocketServer(), "/send-message-every-quarter-second"); + ASSERT_TRUE(StartWebSocketServer()); } // Runs a specific setup for service worker-based extensions. We open a web
diff --git a/chrome/browser/extensions/service_worker_tracking_browsertest.cc b/chrome/browser/extensions/service_worker_tracking_browsertest.cc index 87a066f..d12012cd 100644 --- a/chrome/browser/extensions/service_worker_tracking_browsertest.cc +++ b/chrome/browser/extensions/service_worker_tracking_browsertest.cc
@@ -6,6 +6,7 @@ #include <utility> #include <vector> +#include "base/files/file_util.h" #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h"
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 6668791..fb60ef9 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -685,6 +685,11 @@ "owners": ["vinnypersky@google.com", "payments-autofill-team@google.com"], "expiry_milestone": 145 }, + { + "name": "autofill-enable-buy-now-pay-later-for-externally-linked-klarna", + "owners": ["wilsonlow@google.com", "payments-autofill-team@google.com"], + "expiry_milestone": 150 + }, { "name": "autofill-enable-buy-now-pay-later-for-klarna", "owners": ["wilsonlow@google.com", "payments-autofill-team@google.com"], @@ -1657,11 +1662,6 @@ "expiry_milestone": 126 }, { - "name": "collaboration-automotive", - "owners": ["haileywang@google.com", "//components/collaboration/OWNERS"], - "expiry_milestone": 140 - }, - { "name": "collaboration-entreprise-v2", "owners": ["haileywang@google.com", "//components/collaboration/OWNERS"], "expiry_milestone": 140 @@ -3533,6 +3533,11 @@ "expiry_milestone": 145 }, { + "name": "enable-hls-playback", + "owners": ["tmathmeyer@chromium.org", "videostack-eng@google.com"], + "expiry_milestone": 141 + }, + { "name": "enable-holding-space-suggestions", "owners": [ "//ash/public/cpp/holding_space/OWNERS" ], "expiry_milestone": 140 @@ -5478,7 +5483,7 @@ { "name": "help-app-onboarding-revamp", "owners": [ "//ash/webui/help_app_ui/OWNERS" ], - "expiry_milestone": 136 + "expiry_milestone": 145 }, { "name": "help-app-opens-instead-of-release-notes-notification",
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index fe6bae4..9902be5 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -687,6 +687,12 @@ "When enabled, users will have the option to pay with buy now pay later on " "specific merchant webpages."; +const char kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaName[] = + "Enable buy now pay later for externally linked Klarna"; +const char kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaDescription[] = + "When enabled, users will have the option to pay with buy now pay later " + "with externally linked Klarna on specific merchant webpages."; + const char kAutofillEnableBuyNowPayLaterForKlarnaName[] = "Enable buy now pay later on Autofill for Klarna"; const char kAutofillEnableBuyNowPayLaterForKlarnaDescription[] = @@ -1254,10 +1260,6 @@ const char kCodeBasedRBDName[] = "Code-based RBD"; const char kCodeBasedRBDDescription[] = "Enables the Code-based RBD."; -const char kCollaborationAutomotiveName[] = "Collaboration Automotive"; -const char kCollaborationAutomotiveDescription[] = - "Enable the collaboration feature on automotive platforms."; - const char kCollaborationEntrepriseV2Name[] = "Collaboration Entreprise V2"; const char kCollaborationEntrepriseV2Description[] = "Enables the collaboration feature for entreprise users within the same " @@ -8597,6 +8599,12 @@ "Enables profile management triggered by generic OIDC authentications."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(ENABLE_HLS_DEMUXER) +const char kEnableHlsPlaybackName[] = "Enable direct playback of HLS manifests"; +const char kEnableHlsPlaybackDescription[] = + "Enables built-in HLS player for adaptive playback and live streams."; +#endif // BUILDFLAG(ENABLE_HLS_DEMUXER) + #if !BUILDFLAG(IS_CHROMEOS) const char kProfilesReorderingName[] = "Profiles Reordering"; const char kProfilesReorderingDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index b398cf3..d9d85bb3 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -439,6 +439,10 @@ extern const char kAutofillEnableBuyNowPayLaterName[]; extern const char kAutofillEnableBuyNowPayLaterDescription[]; +extern const char kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaName[]; +extern const char + kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarnaDescription[]; + extern const char kAutofillEnableBuyNowPayLaterForKlarnaName[]; extern const char kAutofillEnableBuyNowPayLaterForKlarnaDescription[]; @@ -722,9 +726,6 @@ extern const char kCodeBasedRBDName[]; extern const char kCodeBasedRBDDescription[]; -extern const char kCollaborationAutomotiveName[]; -extern const char kCollaborationAutomotiveDescription[]; - extern const char kCollaborationEntrepriseV2Name[]; extern const char kCollaborationEntrepriseV2Description[]; @@ -5048,6 +5049,11 @@ extern const char kEnableGenericOidcAuthProfileManagementDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(ENABLE_HLS_DEMUXER) +extern const char kEnableHlsPlaybackName[]; +extern const char kEnableHlsPlaybackDescription[]; +#endif // BUILDFLAG(ENABLE_HLS_DEMUXER) + #if !BUILDFLAG(IS_CHROMEOS) extern const char kProfilesReorderingName[]; extern const char kProfilesReorderingDescription[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc index 376ddf9..02aa2e1 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -38,6 +38,7 @@ #include "components/download/public/common/download_features.h" #include "components/embedder_support/android/util/cdn_utils.h" #include "components/enterprise/data_controls/core/browser/features.h" +#include "components/facilitated_payments/core/features/features.h" #include "components/feature_engagement/public/feature_constants.h" #include "components/feature_engagement/public/feature_list.h" #include "components/feed/feed_feature_list.h" @@ -430,6 +431,7 @@ &language::kCctAutoTranslate, &language::kDetailedLanguageSettings, &optimization_guide::features::kPushNotifications, + &payments::facilitated::kFacilitatedPaymentsEnableA2APayment, &page_info::kPageInfoAboutThisSiteMoreLangs, &password_manager::features::kBiometricAuthIdentityCheck, &password_manager::features::kBiometricTouchToFill,
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java index 12e8457..59c5db55 100644 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -399,6 +399,8 @@ "EnableClipboardDataControlsAndroid"; public static final String ENABLE_DISCOUNT_INFO_API = "EnableDiscountInfoApi"; public static final String ENABLE_EXCLUSIVE_ACCESS_MANAGER = "EnableExclusiveAccessManager"; + public static final String FACILITATED_PAYMENTS_ENABLE_A2A_PAYMENT = + "FacilitatedPaymentsEnableA2APayment"; public static final String ENABLE_SAVE_PACKAGE_FOR_OFF_THE_RECORD = "EnableSavePackageForOffTheRecord"; public static final String ENABLE_X_AXIS_ACTIVITY_TRANSITION = "EnableXAxisActivityTransition";
diff --git a/chrome/browser/glic/glic_keyed_service.cc b/chrome/browser/glic/glic_keyed_service.cc index 9626e94f..381612be 100644 --- a/chrome/browser/glic/glic_keyed_service.cc +++ b/chrome/browser/glic/glic_keyed_service.cc
@@ -240,13 +240,14 @@ auto suggestions = mojom::ZeroStateSuggestions::New(); suggestions->tab_id = GetTabId(active_web_contents); suggestions->tab_url = active_web_contents->GetLastCommittedURL(); - contextual_cueing_service_->GetContextualGlicZeroStateSuggestions( - active_web_contents, is_first_run, supported_tools, - mojo::WrapCallbackWithDefaultInvokeIfNotRun( - base::BindOnce(&GlicKeyedService::OnZeroStateSuggestionsFetched, - GetWeakPtr(), std::move(suggestions), - std::move(callback)), - std::nullopt)); + contextual_cueing_service_ + ->GetContextualGlicZeroStateSuggestionsForFocusedTab( + active_web_contents, is_first_run, supported_tools, + mojo::WrapCallbackWithDefaultInvokeIfNotRun( + base::BindOnce(&GlicKeyedService::OnZeroStateSuggestionsFetched, + GetWeakPtr(), std::move(suggestions), + std::move(callback)), + std::nullopt)); } else { std::move(callback).Run(nullptr);
diff --git a/chrome/browser/glic/host/glic_api_browsertest.cc b/chrome/browser/glic/host/glic_api_browsertest.cc index d84a502..dff168f 100644 --- a/chrome/browser/glic/host/glic_api_browsertest.cc +++ b/chrome/browser/glic/host/glic_api_browsertest.cc
@@ -914,7 +914,7 @@ IN_PROC_BROWSER_TEST_F(GlicApiTestWithOneTabAndContextualCueing, testGetZeroStateSuggestions) { EXPECT_CALL(*mock_cueing_service(), - GetContextualGlicZeroStateSuggestions(_, _, _, _)) + GetContextualGlicZeroStateSuggestionsForFocusedTab(_, _, _, _)) .Times(1); ExecuteJsTest(); @@ -923,7 +923,7 @@ IN_PROC_BROWSER_TEST_F(GlicApiTestWithOneTabAndContextualCueing, testGetZeroStateSuggestionsFailsWhenHidden) { EXPECT_CALL(*mock_cueing_service(), - GetContextualGlicZeroStateSuggestions(_, _, _, _)) + GetContextualGlicZeroStateSuggestionsForFocusedTab(_, _, _, _)) .Times(0); ExecuteJsTest();
diff --git a/chrome/browser/ntp_customization/BUILD.gn b/chrome/browser/ntp_customization/BUILD.gn index 4e46d05..387e0da 100644 --- a/chrome/browser/ntp_customization/BUILD.gn +++ b/chrome/browser/ntp_customization/BUILD.gn
@@ -23,6 +23,12 @@ "java/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsCoordinator.java", "java/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsListContainerView.java", "java/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsMediator.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetView.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinator.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemView.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediator.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeProperty.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinder.java", ] deps = [ ":java_resources", @@ -31,6 +37,7 @@ "//base:resetters_java", "//base:supplier_java", "//chrome/browser/feed/android:java", + "//chrome/browser/flags:java", "//chrome/browser/magic_stack/android:java", "//chrome/browser/preferences:java", "//chrome/browser/preferences:pref_service_java", @@ -40,7 +47,9 @@ "//chrome/browser/tabmodel:java", "//chrome/browser/util:java", "//components/browser_ui/bottomsheet/android:java", + "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", + "//components/cached_flags:java", "//components/feed/core/v2:feedv2_common_core_java", "//components/prefs/android:java", "//components/search_engines/android:java", @@ -51,6 +60,8 @@ "//third_party/androidx:androidx_appcompat_appcompat_java", "//third_party/androidx:androidx_appcompat_appcompat_resources_java", "//third_party/androidx:androidx_browser_browser_java", + "//third_party/androidx:androidx_constraintlayout_constraintlayout_java", + "//third_party/androidx:androidx_core_core_java", "//ui/android:ui_java", ] resources_package = "org.chromium.chrome.browser.ntp_customization" @@ -109,6 +120,11 @@ "junit/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsCoordinatorUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsListContainerViewUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/ntp_cards/NtpCardsMediatorUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetViewUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinatorUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemViewUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediatorUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinderUnitTest.java", ] deps = [ ":java",
diff --git a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_bottom_sheet_layout.xml b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_bottom_sheet_layout.xml index 869869fd..dd17742 100644 --- a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_bottom_sheet_layout.xml +++ b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_bottom_sheet_layout.xml
@@ -4,11 +4,10 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> -<androidx.constraintlayout.widget.ConstraintLayout + +<org.chromium.chrome.browser.ntp_customization.theme.NtpThemeBottomSheetView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="UnusedResources" android:id="@+id/ntp_customization_theme_bottom_sheet_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -57,7 +56,7 @@ app:layout_constraintStart_toEndOf="@id/bottom_sheet_title" app:layout_constraintEnd_toEndOf="parent" /> - <LinearLayout + <LinearLayout android:id="@+id/theme_list_items_container" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -66,7 +65,6 @@ android:layout_marginHorizontal="@dimen/ntp_customization_bottom_sheet_layout_padding_bottom" app:layout_constraintTop_toBottomOf="@id/bottom_sheet_title" app:layout_constraintStart_toStartOf="parent"> + </LinearLayout> - </LinearLayout> - -</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file +</org.chromium.chrome.browser.ntp_customization.theme.NtpThemeBottomSheetView>
diff --git a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_colors_item_layout.xml b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_colors_item_layout.xml index 662a2a70..de2ebe9ef 100644 --- a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_colors_item_layout.xml +++ b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_colors_item_layout.xml
@@ -5,10 +5,9 @@ found in the LICENSE file. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="UnusedResources" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="@dimen/ntp_customization_theme_list_item_padding_vertical" @@ -42,4 +41,5 @@ app:tint="@color/default_icon_color_tint_list" android:src="@drawable/ic_check_googblue_24dp" android:visibility="gone"/> -</LinearLayout> \ No newline at end of file + +</org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView> \ No newline at end of file
diff --git a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_default_item_layout.xml b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_default_item_layout.xml index 537b027..87e5071 100644 --- a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_default_item_layout.xml +++ b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_chrome_default_item_layout.xml
@@ -5,10 +5,9 @@ found in the LICENSE file. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="UnusedResources" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="@dimen/ntp_customization_theme_list_item_padding_vertical" @@ -42,4 +41,5 @@ app:tint="@color/default_icon_color_tint_list" android:src="@drawable/ic_check_googblue_24dp" android:visibility="gone"/> -</LinearLayout> \ No newline at end of file + +</org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView>
diff --git a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_theme_collections_item_layout.xml b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_theme_collections_item_layout.xml index 0e8625e..2a370a2c 100644 --- a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_theme_collections_item_layout.xml +++ b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_theme_collections_item_layout.xml
@@ -5,10 +5,9 @@ found in the LICENSE file. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="UnusedResources" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="@dimen/ntp_customization_theme_list_item_padding_vertical" @@ -41,4 +40,5 @@ android:importantForAccessibility="no" app:tint="@color/default_icon_color_tint_list" android:src="@drawable/forward_arrow_icon"/> -</LinearLayout> \ No newline at end of file + +</org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView>
diff --git a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_upload_an_image_item_layout.xml b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_upload_an_image_item_layout.xml index b1a8d4e..361c91ce 100644 --- a/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_upload_an_image_item_layout.xml +++ b/chrome/browser/ntp_customization/java/res/layout/ntp_customization_theme_list_upload_an_image_item_layout.xml
@@ -5,11 +5,9 @@ found in the LICENSE file. --> -<LinearLayout +<org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="UnusedResources" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="@dimen/ntp_customization_theme_list_item_padding_vertical" @@ -43,4 +41,5 @@ app:tint="@color/default_icon_color_tint_list" android:src="@drawable/ic_check_googblue_24dp" android:visibility="gone"/> -</LinearLayout> \ No newline at end of file + +</org.chromium.chrome.browser.ntp_customization.theme.NtpThemeListItemView>
diff --git a/chrome/browser/ntp_customization/java/res/values/ids.xml b/chrome/browser/ntp_customization/java/res/values/ids.xml index 44ff9d7..5bea6de 100644 --- a/chrome/browser/ntp_customization/java/res/values/ids.xml +++ b/chrome/browser/ntp_customization/java/res/values/ids.xml
@@ -9,4 +9,5 @@ <!-- NTP customization main bottom sheet sections --> <item type="id" name="ntp_cards" /> <item type="id" name="feed_settings" /> + <item type="id" name="theme" /> </resources> \ No newline at end of file
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationCoordinator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationCoordinator.java index 8be5115a..1a4aba9 100644 --- a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationCoordinator.java +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationCoordinator.java
@@ -8,6 +8,7 @@ import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.FEED; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.MAIN; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.NTP_CARDS; +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.THEME; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.LAYOUT_TO_DISPLAY; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.LIST_CONTAINER_KEYS; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.VIEW_FLIPPER_KEYS; @@ -25,6 +26,7 @@ import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.ntp_customization.feed.FeedSettingsCoordinator; import org.chromium.chrome.browser.ntp_customization.ntp_cards.NtpCardsCoordinator; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.ui.modelutil.PropertyKey; @@ -49,15 +51,22 @@ private NtpCustomizationMediator mMediator; private @MonotonicNonNull NtpCardsCoordinator mNtpCardsCoordinator; private @Nullable FeedSettingsCoordinator mFeedSettingsCoordinator; + private @Nullable NtpThemeCoordinator mNtpThemeCoordinator; private ViewFlipper mViewFlipperView; - @IntDef({BottomSheetType.MAIN, BottomSheetType.NTP_CARDS, BottomSheetType.FEED}) + @IntDef({ + BottomSheetType.MAIN, + BottomSheetType.NTP_CARDS, + BottomSheetType.FEED, + BottomSheetType.THEME + }) @Retention(RetentionPolicy.SOURCE) public @interface BottomSheetType { int MAIN = 0; int NTP_CARDS = 1; int FEED = 2; - int NUM_ENTRIES = 3; + int THEME = 3; + int NUM_ENTRIES = 4; } @IntDef({EntryPointType.MAIN_MENU, EntryPointType.TOOL_BAR, EntryPointType.NEW_TAB_PAGE}) @@ -137,6 +146,7 @@ // before calling renderListContent(). mMediator.registerClickListener(NTP_CARDS, getOptionClickListener(NTP_CARDS)); mMediator.registerClickListener(FEED, getOptionClickListener(FEED)); + mMediator.registerClickListener(THEME, getOptionClickListener(THEME)); mMediator.renderListContent(); } } @@ -162,6 +172,7 @@ case MAIN -> mMediator.showBottomSheet(MAIN); case NTP_CARDS -> showNtpCardsBottomSheet(); case FEED -> showFeedBottomSheet(); + case THEME -> showThemeBottomSheet(); default -> { assert false : "Bottom sheet type not supported!"; } @@ -184,6 +195,15 @@ mMediator.showBottomSheet(FEED); } + private void showThemeBottomSheet() { + if (mNtpThemeCoordinator == null) { + mNtpThemeCoordinator = + new NtpThemeCoordinator( + mContext, mDelegate, mProfileSupplier.get().getOriginalProfile()); + } + mMediator.showBottomSheet(THEME); + } + /** * Returns a click listener to handle user clicks on the options in the NTP customization main * bottom sheet. @@ -197,6 +217,9 @@ case FEED -> { return v -> showFeedBottomSheet(); } + case THEME -> { + return v -> showThemeBottomSheet(); + } default -> { assert false : "Bottom sheet type not supported!"; return assumeNonNull(null); @@ -252,6 +275,9 @@ if (mFeedSettingsCoordinator != null) { mFeedSettingsCoordinator.destroy(); } + if (mNtpThemeCoordinator != null) { + mNtpThemeCoordinator.destroy(); + } } BottomSheetDelegate getBottomSheetDelegateForTesting() {
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java index 6346565d..94f0b901 100644 --- a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java
@@ -8,6 +8,7 @@ import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.FEED; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.MAIN; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.NTP_CARDS; +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.THEME; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.LAYOUT_TO_DISPLAY; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.LIST_CONTAINER_VIEW_DELEGATE; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.MAIN_BOTTOM_SHEET_FEED_SECTION_SUBTITLE; @@ -22,6 +23,7 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.feed.FeedFeatures; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; @@ -54,7 +56,7 @@ private final NtpCustomizationBottomSheetContent mBottomSheetContent; private final BottomSheetObserver mBottomSheetObserver; private final PropertyModel mViewFlipperPropertyModel; - private List<Integer> mListContent; + private final List<Integer> mListContent; private final Supplier<Profile> mProfileSupplier; private final @Nullable PropertyModel mContainerPropertyModel; private @Nullable Profile mProfile; @@ -160,6 +162,8 @@ return R.id.ntp_cards; case FEED: return R.id.feed_settings; + case THEME: + return R.id.theme; default: return View.NO_ID; } @@ -172,6 +176,8 @@ return context.getString(R.string.home_modules_configuration); case FEED: return context.getString(R.string.ntp_customization_feed_settings_title); + case THEME: + return context.getString(R.string.ntp_customization_theme_title); default: assert false : "Bottom sheet type not supported!"; return assumeNonNull(null); @@ -235,6 +241,9 @@ if (FeedFeatures.isFeedEnabled(mProfile)) { content.add(FEED); } + if (ChromeFeatureList.sNewTabPageCustomizationV2.isEnabled()) { + content.add(THEME); + } return content; } @@ -302,8 +311,4 @@ Map<Integer, View.OnClickListener> getTypeToListenersForTesting() { return mTypeToListenersMap; } - - void setListContetForTesting(List<Integer> listContent) { - mListContent = listContent; - } }
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationUtils.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationUtils.java index 5b2a223..5abb8f2 100644 --- a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationUtils.java +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationUtils.java
@@ -7,6 +7,16 @@ import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.FEED; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.MAIN; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.NTP_CARDS; +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.THEME; + +import android.app.PendingIntent; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.provider.Browser; + +import androidx.browser.customtabs.CustomTabsIntent; import org.chromium.build.annotations.NullMarked; @@ -14,6 +24,8 @@ @NullMarked public class NtpCustomizationUtils { + private static final String TRUSTED_APPLICATION_CODE_EXTRA = "trusted_application_code_extra"; + /** * Every list in NTP customization bottom sheets should use this function to get the background * for its list items. @@ -51,6 +63,8 @@ return R.string.ntp_customization_ntp_cards_bottom_sheet; case FEED: return R.string.ntp_customization_feed_bottom_sheet; + case THEME: + return R.string.ntp_customization_theme_bottom_sheet; default: assert false : "Bottom sheet type not supported!"; return -1; @@ -70,9 +84,36 @@ return R.string.ntp_customization_ntp_cards_bottom_sheet_opened_full; case FEED: return R.string.ntp_customization_feed_bottom_sheet_opened_full; + case THEME: + return R.string.ntp_customization_theme_bottom_sheet_opened_full; default: assert false : "Bottom sheet type not supported!"; return -1; } } + + // Launch a new activity in the same task with the given uri as a CCT. + public static void launchUriActivity(Context context, String uri) { + CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(); + builder.setShowTitle(true); + builder.setShareState(CustomTabsIntent.SHARE_STATE_ON); + Intent intent = builder.build().intent; + intent.setPackage(context.getPackageName()); + // Adding trusted extras lets us know that the intent came from Chrome. + intent.putExtra(TRUSTED_APPLICATION_CODE_EXTRA, getAuthenticationToken(context)); + intent.setData(Uri.parse(uri)); + intent.setAction(Intent.ACTION_VIEW); + intent.setClassName(context, "org.chromium.chrome.browser.customtabs.CustomTabActivity"); + intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName()); + context.startActivity(intent); + } + + // Copied from IntentHandler, which is in chrome_java, so we can't call it directly. + public static PendingIntent getAuthenticationToken(Context context) { + Intent fakeIntent = new Intent(); + ComponentName fakeComponentName = new ComponentName(context.getPackageName(), "FakeClass"); + fakeIntent.setComponent(fakeComponentName); + int mutabililtyFlag = PendingIntent.FLAG_IMMUTABLE; + return PendingIntent.getActivity(context, 0, fakeIntent, mutabililtyFlag); + } }
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/feed/FeedSettingsMediator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/feed/FeedSettingsMediator.java index ac44c7b..11c913a 100644 --- a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/feed/FeedSettingsMediator.java +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/feed/FeedSettingsMediator.java
@@ -5,6 +5,7 @@ package org.chromium.chrome.browser.ntp_customization.feed; import static org.chromium.build.NullUtil.assumeNonNull; +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationUtils.launchUriActivity; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.BACK_PRESS_HANDLER; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.FEED_SWITCH_ON_CHECKED_CHANGE_LISTENER; import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.IS_FEED_LIST_ITEMS_TITLE_VISIBLE; @@ -17,19 +18,12 @@ import static org.chromium.chrome.browser.ntp_customization.feed.FeedSettingsCoordinator.FeedSettingsBottomSheetSection.HIDDEN; import static org.chromium.chrome.browser.ntp_customization.feed.FeedSettingsCoordinator.FeedSettingsBottomSheetSection.INTERESTS; -import android.app.PendingIntent; -import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.content.res.Resources; -import android.net.Uri; -import android.provider.Browser; import android.support.annotation.VisibleForTesting; import android.view.View; import android.view.View.OnClickListener; -import androidx.browser.customtabs.CustomTabsIntent; - import org.chromium.base.ResettersForTesting; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; @@ -56,7 +50,6 @@ /** Mediator for the feed settings bottom sheet in the NTP customization. */ @NullMarked public class FeedSettingsMediator { - private static final String TRUSTED_APPLICATION_CODE_EXTRA = "trusted_application_code_extra"; private static final String ACTIVITY_CLICK_URL = "https://myactivity.google.com/myactivity?product=50"; private static final String FOLLOWING_CLICK_URL = @@ -298,31 +291,6 @@ FeedUma.recordFeedBottomSheetItemsClicked(FeedUserActionType.TAPPED_LEARN_MORE); } - // Launch a new activity in the same task with the given uri as a CCT. - private static void launchUriActivity(Context context, String uri) { - CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(); - builder.setShowTitle(true); - builder.setShareState(CustomTabsIntent.SHARE_STATE_ON); - Intent intent = builder.build().intent; - intent.setPackage(context.getPackageName()); - // Adding trusted extras lets us know that the intent came from Chrome. - intent.putExtra(TRUSTED_APPLICATION_CODE_EXTRA, getAuthenticationToken(context)); - intent.setData(Uri.parse(uri)); - intent.setAction(Intent.ACTION_VIEW); - intent.setClassName(context, "org.chromium.chrome.browser.customtabs.CustomTabActivity"); - intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName()); - context.startActivity(intent); - } - - // Copied from IntentHandler, which is in chrome_java, so we can't call it directly. - private static PendingIntent getAuthenticationToken(Context context) { - Intent fakeIntent = new Intent(); - ComponentName fakeComponentName = new ComponentName(context.getPackageName(), "FakeClass"); - fakeIntent.setComponent(fakeComponentName); - int mutabililtyFlag = PendingIntent.FLAG_IMMUTABLE; - return PendingIntent.getActivity(context, 0, fakeIntent, mutabililtyFlag); - } - /** Returns whether the feed articles are turned on and visible to the user. */ private boolean isFeedTurnedOn() { return getPrefService().getBoolean(Pref.ARTICLES_LIST_VISIBLE);
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetView.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetView.java new file mode 100644 index 0000000..c2ee54c5 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetView.java
@@ -0,0 +1,115 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.chromium.build.NullUtil.assumeNonNull; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_COLORS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_DEFAULT; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.THEME_COLLECTIONS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.UPLOAD_AN_IMAGE; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.LinearLayout; + +import androidx.constraintlayout.widget.ConstraintLayout; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.build.annotations.Nullable; +import org.chromium.chrome.browser.ntp_customization.R; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection; + +/** The view of the "New tab page appearance" bottom sheet. */ +@NullMarked +public class NtpThemeBottomSheetView extends ConstraintLayout { + private NtpThemeListItemView mChromeDefaultSection; + private NtpThemeListItemView mUploadImageSection; + private NtpThemeListItemView mChromeColorsSection; + private NtpThemeListItemView mThemeCollectionsSection; + + public NtpThemeBottomSheetView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + + LinearLayout container = findViewById(R.id.theme_list_items_container); + LayoutInflater inflater = LayoutInflater.from(getContext()); + + // Inflate and add each theme section. + mChromeDefaultSection = + (NtpThemeListItemView) + inflater.inflate( + R.layout.ntp_customization_theme_list_chrome_default_item_layout, + container, + false); + container.addView(mChromeDefaultSection); + + mUploadImageSection = + (NtpThemeListItemView) + inflater.inflate( + R.layout.ntp_customization_theme_list_upload_an_image_item_layout, + container, + false); + container.addView(mUploadImageSection); + + mChromeColorsSection = + (NtpThemeListItemView) + inflater.inflate( + R.layout.ntp_customization_theme_list_chrome_colors_item_layout, + container, + false); + container.addView(mChromeColorsSection); + + mThemeCollectionsSection = + (NtpThemeListItemView) + inflater.inflate( + R.layout.ntp_customization_theme_list_theme_collections_item_layout, + container, + false); + container.addView(mThemeCollectionsSection); + } + + void destroy() { + for (int i = 0; i < NTPThemeBottomSheetSection.NUM_ENTRIES; i++) { + NtpThemeListItemView child = assumeNonNull(getItemBySectionType(i)); + child.destroy(); + } + } + + void setSectionTrailingIconVisibility( + @NTPThemeBottomSheetSection int sectionType, boolean visible) { + NtpThemeListItemView ntpThemeListItemView = + assumeNonNull(getItemBySectionType(sectionType)); + ntpThemeListItemView.setTrailingIconVisibility(visible); + } + + void setSectionOnClickListener( + @NTPThemeBottomSheetSection int sectionType, OnClickListener onClickListener) { + NtpThemeListItemView ntpThemeListItemView = + assumeNonNull(getItemBySectionType(sectionType)); + ntpThemeListItemView.setOnClickListener(onClickListener); + } + + @Nullable NtpThemeListItemView getItemBySectionType( + @NTPThemeBottomSheetSection int sectionType) { + switch (sectionType) { + case CHROME_DEFAULT: + return mChromeDefaultSection; + case UPLOAD_AN_IMAGE: + return mUploadImageSection; + case CHROME_COLORS: + return mChromeColorsSection; + case THEME_COLLECTIONS: + return mThemeCollectionsSection; + default: + assert false : "Section type not supported!"; + return null; + } + } +}
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinator.java new file mode 100644 index 0000000..48e9f6f --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinator.java
@@ -0,0 +1,97 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType.THEME; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.THEME_KEYS; + +import android.content.Context; +import android.support.annotation.IntDef; +import android.view.LayoutInflater; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.chrome.browser.ntp_customization.BottomSheetDelegate; +import org.chromium.chrome.browser.ntp_customization.BottomSheetViewBinder; +import org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties; +import org.chromium.chrome.browser.ntp_customization.R; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.ui.modelutil.PropertyModel; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** Coordinator for the NTP appearance settings bottom sheet in the NTP customization. */ +@NullMarked +public class NtpThemeCoordinator { + + /** NTP appearance sections that are shown in the theme bottom sheet. */ + @IntDef({ + NTPThemeBottomSheetSection.CHROME_DEFAULT, + NTPThemeBottomSheetSection.UPLOAD_AN_IMAGE, + NTPThemeBottomSheetSection.CHROME_COLORS, + NTPThemeBottomSheetSection.THEME_COLLECTIONS, + NTPThemeBottomSheetSection.NUM_ENTRIES + }) + @Retention(RetentionPolicy.SOURCE) + public @interface NTPThemeBottomSheetSection { + int CHROME_DEFAULT = 0; + int UPLOAD_AN_IMAGE = 1; + int CHROME_COLORS = 2; + int THEME_COLLECTIONS = 3; + int NUM_ENTRIES = 4; + } + + private NtpThemeMediator mMediator; + private NtpThemeBottomSheetView mNtpThemeBottomSheetView; + + public NtpThemeCoordinator(Context context, BottomSheetDelegate delegate, Profile profile) { + mNtpThemeBottomSheetView = + (NtpThemeBottomSheetView) + LayoutInflater.from(context) + .inflate( + R.layout.ntp_customization_theme_bottom_sheet_layout, + null, + false); + + delegate.registerBottomSheetLayout(THEME, mNtpThemeBottomSheetView); + + // The bottomSheetPropertyModel is responsible for managing the back press handler of the + // back button in the bottom sheet. + PropertyModel bottomSheetPropertyModel = + new PropertyModel(NtpCustomizationViewProperties.BOTTOM_SHEET_KEYS); + PropertyModelChangeProcessor.create( + bottomSheetPropertyModel, mNtpThemeBottomSheetView, BottomSheetViewBinder::bind); + + // The themePropertyModel is responsible for managing the learn more button in the theme + // bottom sheet. + PropertyModel themePropertyModel = new PropertyModel(THEME_KEYS); + PropertyModelChangeProcessor.create( + themePropertyModel, + mNtpThemeBottomSheetView, + NtpThemeViewBinder::bindThemeBottomSheet); + + mMediator = + new NtpThemeMediator( + bottomSheetPropertyModel, themePropertyModel, delegate, profile); + } + + public void destroy() { + mMediator.destroy(); + mNtpThemeBottomSheetView.destroy(); + } + + NtpThemeMediator getMediatorForTesting() { + return mMediator; + } + + void setMediatorForTesting(NtpThemeMediator mediator) { + mMediator = mediator; + } + + void setNtpThemeBottomSheetViewForTesting(NtpThemeBottomSheetView ntpThemeBottomSheetView) { + mNtpThemeBottomSheetView = ntpThemeBottomSheetView; + } +}
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemView.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemView.java new file mode 100644 index 0000000..5ecf397 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemView.java
@@ -0,0 +1,42 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.build.annotations.Nullable; +import org.chromium.chrome.browser.ntp_customization.R; + +/** The list item view within the "New tab page appearance" bottom sheet. */ +@NullMarked +public class NtpThemeListItemView extends LinearLayout { + + public NtpThemeListItemView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + void destroy() { + setOnClickListener(null); + } + + /** + * Set the visibility of section's trailing icon. + * + * @param visible Whether icon is visible. + */ + void setTrailingIconVisibility(boolean visible) { + ImageView ntpThemeListItemTrailingIcon = findViewById(R.id.trailing_icon); + if (visible) { + ntpThemeListItemTrailingIcon.setVisibility(View.VISIBLE); + } else { + ntpThemeListItemTrailingIcon.setVisibility(View.GONE); + } + } +}
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediator.java new file mode 100644 index 0000000..6a419a8 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediator.java
@@ -0,0 +1,124 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationUtils.launchUriActivity; +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.BACK_PRESS_HANDLER; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_COLORS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_DEFAULT; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.THEME_COLLECTIONS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.UPLOAD_AN_IMAGE; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.IS_SECTION_TRAILING_ICON_VISIBLE; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.LEARN_MORE_BUTTON_CLICK_LISTENER; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.SECTION_ON_CLICK_LISTENER; + +import android.support.annotation.VisibleForTesting; +import android.util.Pair; +import android.view.View; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.chrome.browser.ntp_customization.BottomSheetDelegate; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.ui.modelutil.PropertyModel; + +/** Mediator for the NTP appearance settings bottom sheet in the NTP customization. */ +@NullMarked +public class NtpThemeMediator { + + // TODO(crbug.com/423579377): Update the url for learn more button. + private static final String LEARN_MORE_CLICK_URL = + "https://support.google.com/chrome/?p=new_tab"; + private final PropertyModel mBottomSheetPropertyModel; + private final PropertyModel mThemePropertyModel; + private final BottomSheetDelegate mBottomSheetDelegate; + + public NtpThemeMediator( + PropertyModel bottomSheetPropertyModel, + PropertyModel themePropertyModel, + BottomSheetDelegate delegate, + Profile profile) { + mBottomSheetPropertyModel = bottomSheetPropertyModel; + mThemePropertyModel = themePropertyModel; + mBottomSheetDelegate = delegate; + + // Hides the back button when the theme settings bottom sheet is displayed standalone. + mBottomSheetPropertyModel.set( + BACK_PRESS_HANDLER, + delegate.shouldShowAlone() + ? null + : v -> mBottomSheetDelegate.backPressOnCurrentBottomSheet()); + + setOnClickListenerForAllSection(); + mThemePropertyModel.set(LEARN_MORE_BUTTON_CLICK_LISTENER, this::handleLearnMoreClick); + } + + void destroy() { + mBottomSheetPropertyModel.set(BACK_PRESS_HANDLER, null); + mThemePropertyModel.set(LEARN_MORE_BUTTON_CLICK_LISTENER, null); + } + + /** Sets the on click listener for each theme bottom sheet section. */ + private void setOnClickListenerForAllSection() { + mThemePropertyModel.set( + SECTION_ON_CLICK_LISTENER, + new Pair<>(CHROME_DEFAULT, this::handleChromeDefaultSectionClick)); + mThemePropertyModel.set( + SECTION_ON_CLICK_LISTENER, + new Pair<>(UPLOAD_AN_IMAGE, this::handleUploadAnImageSectionClick)); + mThemePropertyModel.set( + SECTION_ON_CLICK_LISTENER, + new Pair<>(CHROME_COLORS, this::handleChromeColorsSectionClick)); + mThemePropertyModel.set( + SECTION_ON_CLICK_LISTENER, + new Pair<>(THEME_COLLECTIONS, this::handleThemeCollectionsSectionClick)); + } + + /** + * Updates the visibility of the trailing icon for each theme section. The icon is made visible + * for the section that matches {@code sectionType}, and hidden for all other sections. + * + * @param sectionType The {@link NTPThemeBottomSheetSection} to show the trailing icon for. + */ + private void updateTrailingIconVisibilityForSectionType( + @NTPThemeBottomSheetSection int sectionType) { + for (int i = 0; i < NTPThemeBottomSheetSection.NUM_ENTRIES; i++) { + if (i == THEME_COLLECTIONS) { + continue; + } + + if (i == sectionType) { + mThemePropertyModel.set(IS_SECTION_TRAILING_ICON_VISIBLE, new Pair<>(i, true)); + } else { + mThemePropertyModel.set(IS_SECTION_TRAILING_ICON_VISIBLE, new Pair<>(i, false)); + } + } + } + + @VisibleForTesting + void handleChromeDefaultSectionClick(View view) { + updateTrailingIconVisibilityForSectionType(CHROME_DEFAULT); + } + + @VisibleForTesting + void handleUploadAnImageSectionClick(View view) { + updateTrailingIconVisibilityForSectionType(UPLOAD_AN_IMAGE); + } + + @VisibleForTesting + void handleChromeColorsSectionClick(View view) { + updateTrailingIconVisibilityForSectionType(CHROME_COLORS); + } + + @VisibleForTesting + void handleThemeCollectionsSectionClick(View view) { + updateTrailingIconVisibilityForSectionType(THEME_COLLECTIONS); + } + + @VisibleForTesting + void handleLearnMoreClick(View view) { + launchUriActivity(view.getContext(), LEARN_MORE_CLICK_URL); + } +}
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeProperty.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeProperty.java new file mode 100644 index 0000000..c981f24 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeProperty.java
@@ -0,0 +1,35 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import android.util.Pair; +import android.view.View; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModel; + +@NullMarked +public class NtpThemeProperty { + public static final PropertyModel.WritableObjectPropertyKey<View.OnClickListener> + LEARN_MORE_BUTTON_CLICK_LISTENER = new PropertyModel.WritableObjectPropertyKey<>(); + + // The key manages the visibility of trailing icon for each section, with the integer + // representing the section type and the boolean indicating its visibility. + public static final PropertyModel.WritableObjectPropertyKey<Pair<Integer, Boolean>> + IS_SECTION_TRAILING_ICON_VISIBLE = new PropertyModel.WritableObjectPropertyKey<>(); + + // The key manages the {@link View.OnClickListener} of each section, with the integer + // representing the section type. + public static final PropertyModel.WritableObjectPropertyKey<Pair<Integer, View.OnClickListener>> + SECTION_ON_CLICK_LISTENER = new PropertyModel.WritableObjectPropertyKey<>(); + + public static final PropertyKey[] THEME_KEYS = + new PropertyKey[] { + LEARN_MORE_BUTTON_CLICK_LISTENER, + IS_SECTION_TRAILING_ICON_VISIBLE, + SECTION_ON_CLICK_LISTENER + }; +}
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinder.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinder.java new file mode 100644 index 0000000..30dd438 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinder.java
@@ -0,0 +1,42 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.IS_SECTION_TRAILING_ICON_VISIBLE; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.LEARN_MORE_BUTTON_CLICK_LISTENER; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.SECTION_ON_CLICK_LISTENER; + +import android.support.annotation.VisibleForTesting; +import android.view.View; +import android.widget.ImageView; + +import org.chromium.build.annotations.NullMarked; +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModel; + +/** Handles the binding of display and interaction for the modules in the theme bottom sheet. */ +@NullMarked +public class NtpThemeViewBinder { + @VisibleForTesting + public static void bindThemeBottomSheet( + PropertyModel model, View view, PropertyKey propertyKey) { + if (propertyKey == LEARN_MORE_BUTTON_CLICK_LISTENER) { + ImageView learnMoreButton = + view.findViewById( + org.chromium.chrome.browser.ntp_customization.R.id.learn_more_button); + learnMoreButton.setOnClickListener(model.get(LEARN_MORE_BUTTON_CLICK_LISTENER)); + } else if (propertyKey == IS_SECTION_TRAILING_ICON_VISIBLE) { + ((NtpThemeBottomSheetView) view) + .setSectionTrailingIconVisibility( + model.get(IS_SECTION_TRAILING_ICON_VISIBLE).first, + model.get(IS_SECTION_TRAILING_ICON_VISIBLE).second); + } else if (propertyKey == SECTION_ON_CLICK_LISTENER) { + ((NtpThemeBottomSheetView) view) + .setSectionOnClickListener( + model.get(SECTION_ON_CLICK_LISTENER).first, + model.get(SECTION_ON_CLICK_LISTENER).second); + } + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetViewUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetViewUnitTest.java new file mode 100644 index 0000000..b80cc2b --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeBottomSheetViewUnitTest.java
@@ -0,0 +1,97 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_COLORS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_DEFAULT; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.THEME_COLLECTIONS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.UPLOAD_AN_IMAGE; + +import android.content.Context; +import android.view.ContextThemeWrapper; +import android.view.View.OnClickListener; + +import androidx.test.core.app.ApplicationProvider; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.ntp_customization.R; + +/** Unit tests for {@link NtpThemeBottomSheetView}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class NtpThemeBottomSheetViewUnitTest { + + @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private NtpThemeListItemView mChromeDefaultSection; + @Mock private NtpThemeListItemView mUploadAnImageSection; + @Mock private NtpThemeListItemView mChromeColorsSection; + @Mock private NtpThemeListItemView mThemeCollectionsSection; + @Mock private OnClickListener mOnClickListener; + + private NtpThemeBottomSheetView mNtpThemeBottomSheetView; + private Context mContext; + + @Before + public void setUp() { + mContext = + new ContextThemeWrapper( + ApplicationProvider.getApplicationContext(), + R.style.Theme_BrowserUI_DayNight); + + mNtpThemeBottomSheetView = spy(new NtpThemeBottomSheetView(mContext, null)); + + when(mNtpThemeBottomSheetView.getItemBySectionType(CHROME_DEFAULT)) + .thenReturn(mChromeDefaultSection); + when(mNtpThemeBottomSheetView.getItemBySectionType(UPLOAD_AN_IMAGE)) + .thenReturn(mUploadAnImageSection); + when(mNtpThemeBottomSheetView.getItemBySectionType(CHROME_COLORS)) + .thenReturn(mChromeColorsSection); + when(mNtpThemeBottomSheetView.getItemBySectionType(THEME_COLLECTIONS)) + .thenReturn(mThemeCollectionsSection); + } + + @Test + public void testDestroy() { + mNtpThemeBottomSheetView.destroy(); + + verify(mChromeDefaultSection).destroy(); + verify(mUploadAnImageSection).destroy(); + verify(mChromeColorsSection).destroy(); + verify(mThemeCollectionsSection).destroy(); + } + + @Test + public void testSetSectionTrailingIconVisibility() { + mNtpThemeBottomSheetView.setSectionTrailingIconVisibility(CHROME_DEFAULT, true); + verify(mChromeDefaultSection).setTrailingIconVisibility(eq(true)); + + mNtpThemeBottomSheetView.setSectionTrailingIconVisibility(UPLOAD_AN_IMAGE, false); + verify(mUploadAnImageSection).setTrailingIconVisibility(eq(false)); + } + + @Test + public void testSetSectionOnClickListener() { + mNtpThemeBottomSheetView.setSectionOnClickListener(CHROME_COLORS, mOnClickListener); + verify(mChromeColorsSection).setOnClickListener(mOnClickListener); + + mNtpThemeBottomSheetView.setSectionOnClickListener(THEME_COLLECTIONS, mOnClickListener); + verify(mThemeCollectionsSection).setOnClickListener(mOnClickListener); + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinatorUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinatorUnitTest.java new file mode 100644 index 0000000..83dde81 --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeCoordinatorUnitTest.java
@@ -0,0 +1,76 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import android.content.Context; +import android.view.ContextThemeWrapper; + +import androidx.test.core.app.ApplicationProvider; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.ntp_customization.BottomSheetDelegate; +import org.chromium.chrome.browser.ntp_customization.R; +import org.chromium.chrome.browser.profiles.Profile; + +/** Unit tests for {@link NtpThemeCoordinator}. */ +@RunWith(BaseRobolectricTestRunner.class) +public class NtpThemeCoordinatorUnitTest { + @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private BottomSheetDelegate mBottomSheetDelegate; + @Mock private Profile mProfile; + + private Context mContext; + private NtpThemeCoordinator mCoordinator; + + @Before + public void setUp() { + mContext = + new ContextThemeWrapper( + ApplicationProvider.getApplicationContext(), + R.style.Theme_BrowserUI_DayNight); + mCoordinator = new NtpThemeCoordinator(mContext, mBottomSheetDelegate, mProfile); + } + + @Test + public void testConstructor() { + assertNotNull(mCoordinator.getMediatorForTesting()); + } + + @Test + public void testRegisterBottomSheetLayout() { + verify(mBottomSheetDelegate) + .registerBottomSheetLayout( + eq(NtpThemeCoordinator.NTPThemeBottomSheetSection.THEME_COLLECTIONS), + any()); + } + + @Test + public void testDestroy() { + NtpThemeMediator mediator = mock(NtpThemeMediator.class); + mCoordinator.setMediatorForTesting(mediator); + mCoordinator.destroy(); + verify(mediator).destroy(); + + NtpThemeBottomSheetView ntpThemeBottomSheetView = mock(NtpThemeBottomSheetView.class); + mCoordinator.setNtpThemeBottomSheetViewForTesting(ntpThemeBottomSheetView); + mCoordinator.destroy(); + verify(ntpThemeBottomSheetView).destroy(); + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemViewUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemViewUnitTest.java new file mode 100644 index 0000000..a32b9bd --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemViewUnitTest.java
@@ -0,0 +1,62 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import android.app.Activity; +import android.view.View; +import android.widget.ImageView; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.Robolectric; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.ntp_customization.R; + +/** Unit tests for {@link NtpThemeListItemView}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class NtpThemeListItemViewUnitTest { + + private NtpThemeListItemView mNtpThemeListItemView; + private ImageView mTrailingIcon; + + @Before + public void setUp() { + Activity activity = Robolectric.buildActivity(Activity.class).setup().get(); + mNtpThemeListItemView = new NtpThemeListItemView(activity, null); + mTrailingIcon = new ImageView(activity); + mTrailingIcon.setId(R.id.trailing_icon); + mNtpThemeListItemView.addView(mTrailingIcon); + activity.setContentView(mNtpThemeListItemView); + } + + @Test + public void testDestroy() { + mNtpThemeListItemView.setOnClickListener(v -> {}); + assertTrue(mNtpThemeListItemView.hasOnClickListeners()); + + mNtpThemeListItemView.destroy(); + + assertFalse(mNtpThemeListItemView.hasOnClickListeners()); + } + + @Test + public void testSetTrailingIconVisibility() { + mTrailingIcon.setVisibility(View.GONE); + mNtpThemeListItemView.setTrailingIconVisibility(true); + assertEquals(View.VISIBLE, mTrailingIcon.getVisibility()); + + mTrailingIcon.setVisibility(View.VISIBLE); + mNtpThemeListItemView.setTrailingIconVisibility(false); + assertEquals(View.GONE, mTrailingIcon.getVisibility()); + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediatorUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediatorUnitTest.java new file mode 100644 index 0000000..2c8a315 --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediatorUnitTest.java
@@ -0,0 +1,125 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import static org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties.BACK_PRESS_HANDLER; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.CHROME_COLORS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection.THEME_COLLECTIONS; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.IS_SECTION_TRAILING_ICON_VISIBLE; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.LEARN_MORE_BUTTON_CLICK_LISTENER; +import static org.chromium.chrome.browser.ntp_customization.theme.NtpThemeProperty.SECTION_ON_CLICK_LISTENER; + +import android.app.Activity; +import android.util.Pair; +import android.view.View; +import android.view.View.OnClickListener; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.Robolectric; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.ntp_customization.BottomSheetDelegate; +import org.chromium.chrome.browser.ntp_customization.NtpCustomizationViewProperties; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.ui.modelutil.PropertyModel; + +/** Tests for {@link NtpThemeMediator}. */ +@RunWith(BaseRobolectricTestRunner.class) +public class NtpThemeMediatorUnitTest { + + @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private BottomSheetDelegate mBottomSheetDelegate; + @Mock private Profile mProfile; + @Mock private View mView; + + private PropertyModel mBottomSheetPropertyModel; + private PropertyModel mThemePropertyModel; + private NtpThemeMediator mMediator; + private Activity mActivity; + + @Before + public void setUp() { + mActivity = Robolectric.buildActivity(Activity.class).setup().get(); + when(mView.getContext()).thenReturn(mActivity); + + mBottomSheetPropertyModel = + new PropertyModel(NtpCustomizationViewProperties.BOTTOM_SHEET_KEYS); + mThemePropertyModel = new PropertyModel(NtpThemeProperty.THEME_KEYS); + } + + @Test + public void testConstructor_shouldShowAlone() { + createMediator(/* shouldShowAlone= */ true); + + assertNull(mBottomSheetPropertyModel.get(BACK_PRESS_HANDLER)); + assertNotNull(mThemePropertyModel.get(LEARN_MORE_BUTTON_CLICK_LISTENER)); + assertNotNull(mThemePropertyModel.get(SECTION_ON_CLICK_LISTENER)); + } + + @Test + public void testConstructor_shouldNotShowAlone() { + createMediator(/* shouldShowAlone= */ false); + + assertNotNull(mBottomSheetPropertyModel.get(BACK_PRESS_HANDLER)); + mBottomSheetPropertyModel.get(BACK_PRESS_HANDLER).onClick(mView); + verify(mBottomSheetDelegate).backPressOnCurrentBottomSheet(); + } + + @Test + public void testDestroy() { + createMediator(/* shouldShowAlone= */ false); + assertNotNull(mBottomSheetPropertyModel.get(BACK_PRESS_HANDLER)); + assertNotNull(mThemePropertyModel.get(LEARN_MORE_BUTTON_CLICK_LISTENER)); + + mMediator.destroy(); + + assertNull(mBottomSheetPropertyModel.get(BACK_PRESS_HANDLER)); + assertNull(mThemePropertyModel.get(LEARN_MORE_BUTTON_CLICK_LISTENER)); + } + + @Test + public void testOnClickListeners() { + createMediator(/* shouldShowAlone= */ true); + + Pair<Integer, OnClickListener> listenerPair = + mThemePropertyModel.get(SECTION_ON_CLICK_LISTENER); + assertEquals(THEME_COLLECTIONS, (int) listenerPair.first); + assertNotNull(listenerPair.second); + listenerPair.second.onClick(mView); + + Pair<Integer, Boolean> visibilityPair = + mThemePropertyModel.get(IS_SECTION_TRAILING_ICON_VISIBLE); + assertEquals(CHROME_COLORS, (int) visibilityPair.first); + assertEquals(false, visibilityPair.second); + + mMediator.handleChromeColorsSectionClick(mView); + visibilityPair = mThemePropertyModel.get(IS_SECTION_TRAILING_ICON_VISIBLE); + assertEquals(CHROME_COLORS, (int) visibilityPair.first); + assertEquals(true, visibilityPair.second); + } + + private void createMediator(boolean shouldShowAlone) { + when(mBottomSheetDelegate.shouldShowAlone()).thenReturn(shouldShowAlone); + mMediator = + new NtpThemeMediator( + mBottomSheetPropertyModel, + mThemePropertyModel, + mBottomSheetDelegate, + mProfile); + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinderUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinderUnitTest.java new file mode 100644 index 0000000..621546c --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinderUnitTest.java
@@ -0,0 +1,96 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.mockito.Mockito.verify; + +import android.app.Activity; +import android.util.Pair; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.Robolectric; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.ntp_customization.R; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeCoordinator.NTPThemeBottomSheetSection; +import org.chromium.ui.modelutil.PropertyModel; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + +/** Tests for {@link NtpThemeViewBinder}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class NtpThemeViewBinderUnitTest { + + @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + @Mock private View.OnClickListener mOnClickListener; + @Mock private NtpThemeBottomSheetView mNtpThemeBottomSheetView; + + private Activity mActivity; + private PropertyModel mModel; + private NtpThemeBottomSheetView mView; + + @Before + public void setUp() { + mActivity = Robolectric.buildActivity(Activity.class).setup().get(); + mView = + (NtpThemeBottomSheetView) + LayoutInflater.from(mActivity) + .inflate( + R.layout.ntp_customization_theme_bottom_sheet_layout, + null, + false); + mModel = new PropertyModel(NtpThemeProperty.THEME_KEYS); + } + + @Test + public void testLearnMoreButtonClickListener() { + PropertyModelChangeProcessor.create( + mModel, mView, NtpThemeViewBinder::bindThemeBottomSheet); + + mModel.set(NtpThemeProperty.LEARN_MORE_BUTTON_CLICK_LISTENER, mOnClickListener); + ImageView learnMoreButton = mView.findViewById(R.id.learn_more_button); + learnMoreButton.performClick(); + verify(mOnClickListener).onClick(learnMoreButton); + } + + @Test + public void testSectionTrailingIconVisibility() { + PropertyModelChangeProcessor.create( + mModel, mNtpThemeBottomSheetView, NtpThemeViewBinder::bindThemeBottomSheet); + + Pair<Integer, Boolean> pair = new Pair<>(NTPThemeBottomSheetSection.CHROME_DEFAULT, true); + mModel.set(NtpThemeProperty.IS_SECTION_TRAILING_ICON_VISIBLE, pair); + verify(mNtpThemeBottomSheetView) + .setSectionTrailingIconVisibility(NTPThemeBottomSheetSection.CHROME_DEFAULT, true); + + pair = new Pair<>(NTPThemeBottomSheetSection.CHROME_DEFAULT, false); + mModel.set(NtpThemeProperty.IS_SECTION_TRAILING_ICON_VISIBLE, pair); + verify(mNtpThemeBottomSheetView) + .setSectionTrailingIconVisibility(NTPThemeBottomSheetSection.CHROME_DEFAULT, false); + } + + @Test + public void testSectionOnClickListener() { + PropertyModelChangeProcessor.create( + mModel, mNtpThemeBottomSheetView, NtpThemeViewBinder::bindThemeBottomSheet); + + final Pair<Integer, View.OnClickListener> pair = + new Pair<>(NTPThemeBottomSheetSection.CHROME_DEFAULT, mOnClickListener); + mModel.set(NtpThemeProperty.SECTION_ON_CLICK_LISTENER, pair); + verify(mNtpThemeBottomSheetView) + .setSectionOnClickListener( + NTPThemeBottomSheetSection.CHROME_DEFAULT, mOnClickListener); + } +}
diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn index 238d90f..f405c12 100644 --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn
@@ -300,6 +300,7 @@ "//chrome/browser/sharing_hub", "//chrome/browser/ui/commerce", "//chrome/browser/ui/extensions", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/send_tab_to_self", "//chrome/browser/ui/tabs", "//chrome/browser/ui/tabs:tab_strip",
diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn index c31735183..73fcf46 100644 --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn
@@ -326,6 +326,7 @@ "//chrome/browser/ui/global_error", "//chrome/browser/ui/global_media_controls", "//chrome/browser/ui/media_router", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/views/side_panel", "//chrome/browser/ui/webui/signin", "//chrome/browser/ui/webui/signin:login",
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 71eed83..f366ea3 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -4254,15 +4254,19 @@ return; } - bool entered_through_keyboard = - IsLensOptionEnteredThroughKeyboard(event_flags); + // TODO(crbug.com/428031945): Clean up once LensOverlayKeyboardSelection + // lands. + bool use_keyboard_accessibility_fallback = + IsLensOptionEnteredThroughKeyboard(event_flags) && + !lens::features::IsLensOverlayKeyboardSelectionEnabled(); bool lens_overlay_for_image_search_enabled = GetBrowser() ->GetFeatures() .lens_overlay_entry_point_controller() ->IsEnabled() && lens::features::UseLensOverlayForImageSearch(); - if (lens_overlay_for_image_search_enabled && !entered_through_keyboard) { + if (lens_overlay_for_image_search_enabled && + !use_keyboard_accessibility_fallback) { lens::RecordAmbientSearchQuery( lens::AmbientSearchEntryPoint:: CONTEXT_MENU_SEARCH_IMAGE_WITH_LENS_OVERLAY); @@ -4284,9 +4288,10 @@ weak_pointer_factory_.GetWeakPtr(), std::move(chrome_render_frame), tab_bounds, view_bounds, device_scale_factor)); } else { - // When the Lens image search feature is entered via the context menu - // with a Keyboard action, use the Lens region search flow through - // core_tab_helper instead of the Lens Overlay flow. + // If keyboard selection in Lens Overlay is disabled, when the Lens image + // search feature is entered via the context menu with a Keyboard action, + // use the Lens region search flow through core_tab_helper instead of the + // Lens Overlay flow. lens::RecordAmbientSearchQuery( lens_overlay_for_image_search_enabled ? lens::AmbientSearchEntryPoint:: @@ -4329,17 +4334,18 @@ ->GetFeatures() .lens_overlay_entry_point_controller() ->IsEnabled(); - // If Lens overlay is enabled, but the user triggered the context menu - // option via keyboard, use the Lens region search flow (with results - // forced into a new tab) instead of the Lens Overlay flow. - // TODO(crbug/353984457): Clean this branching when the new server - // results flow is ready. - bool entered_through_keyboard = - IsLensOptionEnteredThroughKeyboard(event_flags); + // If Lens overlay is enabled but keyboard selection is disabled and the user + // triggered the context menu option via keyboard, use the Lens region search + // flow (with results forced into a new tab) instead of the Lens Overlay flow. + // TODO(crbug.com/428031945): Clean up once LensOverlayKeyboardSelection + // lands. + bool use_keyboard_accessibility_fallback = + IsLensOptionEnteredThroughKeyboard(event_flags) && + !lens::features::IsLensOverlayKeyboardSelectionEnabled(); if (lens_overlay_for_region_search_enabled) { UserEducationService::MaybeNotifyNewBadgeFeatureUsed( GetBrowserContext(), lens::features::kLensOverlay); - if (!entered_through_keyboard) { + if (!use_keyboard_accessibility_fallback) { lens::RecordAmbientSearchQuery( lens::AmbientSearchEntryPoint:: CONTEXT_MENU_SEARCH_REGION_WITH_LENS_OVERLAY); @@ -4355,9 +4361,9 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // If Lens fullscreen search is enabled, we want to send every region search // as a fullscreen capture. - // TODO(crbug/353984457): Clean this branching when the new server - // results flow is ready. - const bool use_fullscreen_capture = entered_through_keyboard; + // TODO(crbug.com/428031945): Clean up once LensOverlayKeyboardSelection + // lands. + const bool use_fullscreen_capture = use_keyboard_accessibility_fallback; if (!lens_region_search_controller_) { lens_region_search_controller_ =
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 97a5e201..11d0c1b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -2639,7 +2639,9 @@ protected: void SetUp() override { base::test::ScopedFeatureList feature_list; - feature_list.InitWithFeatures({lens::features::kLensOverlay}, {}); + feature_list.InitWithFeatures( + {lens::features::kLensOverlay}, + {lens::features::kLensOverlayKeyboardSelection}); // This does not use LensBrowserBaseTest::SetUp because that // function does its own conflicting initialization of a FeatureList.
diff --git a/chrome/browser/resource_coordinator/BUILD.gn b/chrome/browser/resource_coordinator/BUILD.gn index 288f1d26..37656401 100644 --- a/chrome/browser/resource_coordinator/BUILD.gn +++ b/chrome/browser/resource_coordinator/BUILD.gn
@@ -21,3 +21,22 @@ "//chrome/common:chrome_features", ] } + +source_set("resource_coordinator") { + sources = [] + public_deps = [] + + if (!is_android) { + sources += [ + "decision_details.h", + "lifecycle_unit.h", + "tab_load_tracker.h", + ] + public_deps += [ + ":mojo_bindings", + ":mojo_bindings__generator", + "//base", + "//content/public/browser", + ] + } +}
diff --git a/chrome/browser/resources/autofill/autofill_ai_ffr_banner.json b/chrome/browser/resources/autofill/autofill_ai_ffr_banner.json new file mode 100644 index 0000000..3c93f3e --- /dev/null +++ b/chrome/browser/resources/autofill/autofill_ai_ffr_banner.json
@@ -0,0 +1 @@ +{"v":"5.9.6","fr":30,"ip":0,"op":1,"w":320,"h":120,"nm":"autofill ffr","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 22","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30.5,89.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-1.933],[-1.933,0],[0,1.933],[1.933,0]],"o":[[0,1.933],[1.933,0],[0,-1.933],[-1.933,0]],"v":[[-3.5,0],[0,3.5],[3.5,0],[0,-3.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 21","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[43,104,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.453,-2.71],[-2.803,-0.748],[-2.709,1.453],[-0.748,2.803],[1.454,2.709],[2.803,0.748],[2.709,-1.454],[0.748,-2.803]],"o":[[-1.454,2.709],[0.748,2.803],[2.709,1.454],[2.803,-0.748],[1.454,-2.71],[-0.748,-2.803],[-2.709,-1.454],[-2.803,0.748]],"v":[[-8.358,0],[-5.91,5.91],[0,8.358],[5.91,5.91],[8.358,0],[5.91,-5.91],[0,-8.358],[-5.91,-5.91]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.768627464771,0.933333337307,0.815686285496,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 20","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[291,14,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.176,-0.443],[0.642,-0.254],[1.118,0],[0,0],[0.443,0.176],[0.254,0.642],[0,1.118],[0,0],[-0.176,0.443],[-0.642,0.254],[-1.118,0],[0,0],[-0.443,-0.176],[-0.254,-0.642],[0,-1.118]],"o":[[0,1.118],[-0.254,0.642],[-0.443,0.176],[0,0],[-1.118,0],[-0.642,-0.254],[-0.176,-0.443],[0,0],[0,-1.118],[0.254,-0.642],[0.443,-0.176],[0,0],[1.118,0],[0.642,0.254],[0.176,0.443],[0,0]],"v":[[4,0.3],[3.824,2.42],[2.42,3.824],[0.3,4],[-0.3,4],[-2.42,3.824],[-3.824,2.42],[-4,0.3],[-4,-0.3],[-3.824,-2.42],[-2.42,-3.824],[-0.3,-4],[0.3,-4],[2.42,-3.824],[3.824,-2.42],[4,-0.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 19","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277.5,27,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.443,0.15],[-0.641,-0.217],[-0.829,-0.604],[0,0],[0,0],[-0.288,-0.369],[0.015,-0.672],[0.342,-0.971],[0,0],[0,0],[0.27,-0.378],[0.652,-0.193],[1.039,0.016],[0,0],[0,0],[0.451,0.133],[0.389,0.547],[0.308,0.972],[0,0],[0,0],[0.01,0.464],[-0.416,0.534],[-0.86,0.587],[0,0]],"o":[[0.829,-0.604],[0.641,-0.217],[0.443,0.15],[0,0],[0,0],[0.86,0.587],[0.416,0.534],[-0.01,0.464],[0,0],[0,0],[-0.308,0.972],[-0.389,0.547],[-0.451,0.133],[0,0],[0,0],[-1.039,0.016],[-0.652,-0.193],[-0.27,-0.378],[0,0],[0,0],[-0.342,-0.971],[-0.015,-0.672],[0.288,-0.369],[0,0],[0,0]],"v":[[-2.676,-6.781],[-0.989,-7.837],[0.989,-7.837],[2.676,-6.781],[4.49,-5.46],[6.302,-4.222],[7.88,-2.971],[8.499,-1.109],[7.976,0.812],[7.264,2.833],[6.607,4.904],[5.875,6.74],[4.267,7.882],[2.258,7.992],[0,7.958],[-2.258,7.992],[-4.267,7.882],[-5.875,6.74],[-6.607,4.904],[-7.264,2.833],[-7.976,0.812],[-8.499,-1.109],[-7.88,-2.971],[-6.302,-4.222],[-4.49,-5.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.768627464771,0.933333337307,0.815686285496,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 18","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,60,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[8.388,-31.756],[21.613,-31.756],[21.613,-36.356],[8.388,-36.356]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.384,0],[-0.256,0.256],[0,0.383],[0.271,0.256],[0.383,0],[0.272,-0.271],[0,-0.383],[-0.255,-0.271]],"o":[[0.383,0],[0.271,-0.271],[0,-0.383],[-0.256,-0.271],[-0.384,0],[-0.255,0.256],[0,0.383],[0.272,0.256]],"v":[[19.241,-32.691],[20.199,-33.074],[20.606,-34.056],[20.199,-35.015],[19.241,-35.422],[18.258,-35.015],[17.875,-34.056],[18.258,-33.074]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-0.383,0],[-0.256,0.256],[0,0.383],[0.271,0.256],[0.384,0],[0.272,-0.271],[0,-0.383],[-0.255,-0.271]],"o":[[0.384,0],[0.271,-0.271],[0,-0.383],[-0.256,-0.271],[-0.383,0],[-0.255,0.256],[0,0.383],[0.272,0.256]],"v":[[10.759,-32.691],[11.718,-33.074],[12.125,-34.056],[11.718,-35.015],[10.759,-35.422],[9.777,-35.015],[9.394,-34.056],[9.777,-33.074]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.388,-36.356],[8.388,-31.756]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[9.106,-38.225],[20.894,-38.225],[19.84,-41.1],[10.16,-41.1]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.176,-0.176],[0.239,0],[0,0],[0.176,0.16],[0,0.24],[0,0],[0,0],[-0.255,0.176],[-0.32,0],[0,0],[-0.256,-0.176],[-0.112,-0.303],[0,0],[0,0],[0.175,-0.176],[0.239,0],[0,0],[0.175,0.16],[0,0.24],[0,0]],"o":[[0,0],[0,0.24],[-0.159,0.16],[0,0],[-0.239,0],[-0.159,-0.176],[0,0],[0,0],[0.096,-0.303],[0.256,-0.176],[0,0],[0.32,0],[0.255,0.176],[0,0],[0,0],[0,0.24],[-0.16,0.16],[0,0],[-0.24,0],[-0.16,-0.176],[0,0],[0,0]],"v":[[9.25,-29.887],[9.25,-28.881],[8.986,-28.258],[8.388,-28.019],[7.381,-28.019],[6.758,-28.258],[6.519,-28.881],[6.519,-36.5],[8.507,-41.986],[9.034,-42.705],[9.897,-42.969],[20.103,-42.969],[20.966,-42.705],[21.517,-41.986],[23.481,-36.5],[23.481,-28.881],[23.218,-28.258],[22.619,-28.019],[21.613,-28.019],[20.99,-28.258],[20.75,-28.881],[20.75,-29.887]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.117647059262,0.643137276173,0.274509817362,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-high","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":7,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Layer 17","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,60,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[51.381,21.106],[51.381,9.894]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[51.381,21.106],[66.619,21.106],[66.619,9.894],[51.381,9.894]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0.367,0.367],[0,0.511],[0,0],[-0.368,0.367],[-0.511,0],[0,0],[-0.367,-0.367],[0,-0.511],[0,0],[0.368,-0.367],[0.511,0]],"o":[[-0.511,0],[-0.368,-0.367],[0,0],[0,-0.511],[0.367,-0.367],[0,0],[0.511,0],[0.368,0.367],[0,0],[0,0.511],[-0.367,0.367],[0,0]],"v":[[51.381,22.975],[50.064,22.424],[49.513,21.106],[49.513,9.894],[50.064,8.576],[51.381,8.025],[66.619,8.025],[67.936,8.576],[68.488,9.894],[68.488,21.106],[67.936,22.424],[66.619,22.975]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-0.511,0],[-0.367,0.367],[0,0.511],[0.367,0.367],[0.511,0],[0.367,-0.367],[0,-0.511],[-0.368,-0.367]],"o":[[0.511,0],[0.367,-0.367],[0,-0.511],[-0.367,-0.367],[-0.511,0],[-0.368,0.367],[0,0.511],[0.367,0.367]],"v":[[55.981,15.5],[57.299,14.949],[57.85,13.631],[57.299,12.314],[55.981,11.762],[54.664,12.314],[54.113,13.631],[54.664,14.949]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0.702,0.399],[1.086,0],[0.703,-0.415],[0,-0.655]],"o":[[0,0],[0,0],[0,-0.655],[-0.703,-0.415],[-1.086,0],[-0.703,0.399],[0,0]],"v":[[52.244,19.238],[59.719,19.238],[59.719,18.567],[58.665,16.985],[55.981,16.363],[53.298,16.985],[52.244,18.567]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[60.725,13.631],[65.613,13.631],[65.613,11.762],[60.725,11.762]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[60.725,16.506],[65.613,16.506],[65.613,14.637],[60.725,14.637]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.223529413342,0.596078455448,0.827450990677,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-high","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":8,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Layer 16","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[199.264,67.278,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-2.051,0],[0,0],[0,-1.105],[0,0],[1.333,0.762]],"o":[[-1.781,-1.018],[0,0],[1.105,0],[0,0],[0,1.536],[0,0]],"v":[[-6.725,-1.542],[-5.733,-5.278],[5.736,-5.278],[7.736,-3.278],[7.736,3.275],[4.744,5.012]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Layer 15","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[219,75.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-2.761,0],[0,0],[0,-2.761],[0,0],[2.761,0],[0,0],[0,2.761]],"o":[[0,-2.761],[0,0],[2.761,0],[0,0],[0,2.761],[0,0],[-2.761,0],[0,0]],"v":[[-19,-8.5],[-14,-13.5],[14,-13.5],[19,-8.5],[19,8.5],[14,13.5],[-14,13.5],[-19,8.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Layer 14","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,60,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.431,0],[-0.287,0.288],[0,0.431],[0.287,0.288],[0.431,0],[0.287,-0.287],[0,-0.431],[-0.287,-0.287]],"o":[[0.431,0],[0.287,-0.287],[0,-0.431],[-0.287,-0.287],[-0.431,0],[-0.287,0.288],[0,0.431],[0.287,0.288]],"v":[[-63,-9.219],[-61.922,-9.65],[-61.491,-10.728],[-61.922,-11.806],[-63,-12.238],[-64.078,-11.806],[-64.509,-10.728],[-64.078,-9.65]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.846,0],[-0.751,0.256],[-0.639,0.463],[0.751,0.24],[0.846,0],[0.767,-0.24],[0.639,-0.463],[-0.751,-0.255]],"o":[[0.846,0],[0.751,-0.255],[-0.639,-0.463],[-0.751,-0.24],[-0.831,0],[-0.751,0.24],[0.639,0.463],[0.751,0.256]],"v":[[-63,-0.881],[-60.604,-1.265],[-58.52,-2.343],[-60.604,-3.397],[-63,-3.756],[-65.396,-3.397],[-67.48,-2.343],[-65.396,-1.265]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.31,0],[1.15,0.495],[0.862,0.863],[0.495,1.15],[0,1.31],[-0.495,1.15],[-0.863,0.846],[-1.15,0.495],[-1.31,0],[-1.15,-0.495],[-0.846,-0.863],[-0.495,-1.166],[0,-1.31],[0.495,-1.15],[0.863,-0.863],[1.166,-0.495]],"o":[[-1.31,0],[-1.15,-0.495],[-0.863,-0.863],[-0.495,-1.15],[0,-1.31],[0.495,-1.166],[0.862,-0.863],[1.15,-0.495],[1.31,0],[1.166,0.495],[0.863,0.846],[0.495,1.15],[0,1.31],[-0.495,1.15],[-0.846,0.863],[-1.15,0.495]],"v":[[-63,0.988],[-66.69,0.245],[-69.708,-1.792],[-71.745,-4.81],[-72.488,-8.5],[-71.745,-12.19],[-69.708,-15.208],[-66.69,-17.245],[-63,-17.988],[-59.31,-17.245],[-56.292,-15.208],[-54.255,-12.19],[-53.512,-8.5],[-54.255,-4.81],[-56.292,-1.792],[-59.31,0.245]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.942,0],[0.655,0.655],[0,0.942],[-0.655,0.655],[-0.942,0],[-0.655,-0.655],[0,-0.942],[0.655,-0.655]],"o":[[-0.942,0],[-0.655,-0.655],[0,-0.942],[0.655,-0.655],[0.942,0],[0.655,0.655],[0,0.942],[-0.655,0.655]],"v":[[-63,-7.35],[-65.396,-8.332],[-66.378,-10.728],[-65.396,-13.124],[-63,-14.106],[-60.604,-13.124],[-59.622,-10.728],[-60.604,-8.332]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[-0.559,-0.655],[-0.99,0.335],[-1.086,0],[-1.007,-0.351],[-0.815,-0.623],[-0.304,0.815],[0,0.926],[1.485,1.485],[2.108,0],[1.485,-1.485],[0,-2.108],[-0.304,-0.831]],"o":[[0.831,-0.623],[1.006,-0.351],[1.086,0],[1.006,0.335],[0.559,-0.655],[0.303,-0.831],[0,-2.108],[-1.486,-1.485],[-2.108,0],[-1.485,1.485],[0,0.926],[0.303,0.815]],"v":[[-68.87,-3.66],[-66.139,-5.098],[-63,-5.625],[-59.861,-5.098],[-57.13,-3.66],[-55.836,-5.865],[-55.381,-8.5],[-57.609,-13.891],[-63,-16.119],[-68.391,-13.891],[-70.619,-8.5],[-70.163,-5.865]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.298039227724,0.552941203117,0.964705884457,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-high","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Layer 13","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[116.736,59.722,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.051,0],[0,0],[0,0],[-1.333,-0.762]],"o":[[1.781,1.018],[0,0],[0,0],[0,-1.536],[0,0]],"v":[[6.725,1.542],[5.733,5.278],[-7.736,5.278],[-7.736,-3.275],[-4.744,-5.012]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.827450990677,0.890196084976,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Layer 12","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[97,51.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.761,0],[0,0],[0,2.761],[0,0],[-2.761,0],[0,0],[0,-2.761],[0,0]],"o":[[0,0],[-2.761,0],[0,0],[0,-2.761],[0,0],[2.761,0],[0,0],[0,2.761]],"v":[[14,13.5],[-14,13.5],[-19,8.5],[-19,-8.5],[-14,-13.5],[14,-13.5],[19,-8.5],[19,8.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.827450990677,0.890196084976,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Layer 11","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[177,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.657,0],[0,-1.657],[1.657,0],[0,1.657]],"o":[[1.657,0],[0,1.657],[-1.657,0],[0,-1.657]],"v":[[0,-3],[3,0],[0,3],[-3,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Layer 10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[168,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.657,0],[0,-1.657],[1.657,0],[0,1.657]],"o":[[1.657,0],[0,1.657],[-1.657,0],[0,-1.657]],"v":[[0,-3],[3,0],[0,3],[-3,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Layer 9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[159,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.657,0],[0,-1.657],[1.657,0],[0,1.657]],"o":[[1.657,0],[0,1.657],[-1.657,0],[0,-1.657]],"v":[[0,-3],[3,0],[0,3],[-3,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Layer 8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.657,0],[0,-1.657],[1.657,0],[0,1.657]],"o":[[1.657,0],[0,1.657],[-1.657,0],[0,-1.657]],"v":[[0,-3],[3,0],[0,3],[-3,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[141,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.657,0],[0,-1.657],[1.657,0],[0,1.657]],"o":[[1.657,0],[0,1.657],[-1.657,0],[0,-1.657]],"v":[[0,-3],[3,0],[0,3],[-3,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Layer 23","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[159,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.209,0],[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.209],[0,0]],"o":[[0,0],[2.209,0],[0,0],[0,2.209],[0,0],[-2.209,0],[0,0],[0,-2.209]],"v":[[-22,-8],[22,-8],[26,-4],[26,4],[22,8],[-22,8],[-26,4],[-26,-4]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-neutral-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[159,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.209,0],[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.209],[0,0]],"o":[[0,0],[2.209,0],[0,0],[0,2.209],[0,0],[-2.209,0],[0,0],[0,-2.209]],"v":[[-22,-8],[22,-8],[26,-4],[26,4],[22,8],[-22,8],[-26,4],[-26,-4]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gs","o":{"a":0,"k":100,"ix":9},"w":{"a":0,"k":2,"ix":10},"g":{"p":3,"k":{"a":0,"k":[0,0.659,0.78,0.98,0.5,0.478,0.667,0.973,1,0.298,0.553,0.965],"ix":8}},"s":{"a":0,"k":[0,0],"ix":4},"e":{"a":0,"k":[0,-16],"ix":5},"t":1,"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":13},"bm":0,"nm":"cdds.sys.color.illo-primary-low,cdds.sys.color.illo-primary-mid,cdds.sys.color.illo-primary-high","mn":"ADBE Vector Graphic - G-Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-neutral-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,110,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-82,0],[82,0]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gs","o":{"a":0,"k":100,"ix":9},"w":{"a":0,"k":2,"ix":10},"g":{"p":7,"k":{"a":0,"k":[0,0.827,0.89,0.992,0.125,0.435,0.616,0.904,0.25,0.043,0.341,0.816,0.513,0.043,0.341,0.816,0.776,0.043,0.341,0.816,0.888,0.435,0.616,0.904,1,0.827,0.89,0.992],"ix":8}},"s":{"a":0,"k":[81,98],"ix":4},"e":{"a":0,"k":[-82.242,98],"ix":5},"t":1,"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":13},"bm":0,"nm":"cdds.sys.color.illo-primary-min,cdds.sys.color.illo-primary-max,cdds.sys.color.illo-primary-max,cdds.sys.color.illo-primary-max,cdds.sys.color.illo-primary-min","mn":"ADBE Vector Graphic - G-Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,106.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[2.761,0],[0,0],[0,2.761]],"o":[[0,0],[0,0],[0,2.761],[0,0],[-2.761,0],[0,0]],"v":[[-65,-2.5],[65,-2.5],[65,-2.5],[60,2.5],[-60,2.5],[-65,-2.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.486274510622,0.674509823322,0.972549021244,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-mid","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":"Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[175,28.088,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.761],[0,0],[2.761,0],[0,0],[0,0],[0,1.781],[0,0],[-2.761,0]],"o":[[2.761,0],[0,0],[0,2.761],[0,0],[0,0],[-1.26,1.26],[0,0],[0,-2.761],[0,0]],"v":[[14,-17.088],[19,-12.088],[19,4.912],[14,9.912],[-9,9.912],[-15.586,16.498],[-19,15.084],[-19,-12.088],[-14,-17.088]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.768627464771,0.933333337307,0.815686285496,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":22,"ty":1,"nm":"matte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,60,0],"ix":2,"l":2},"a":{"a":0,"k":[160,60,0],"ix":1,"l":2},"s":{"a":0,"k":[100.917,100.917,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Gradient Ramp","np":10,"mn":"ADBE Ramp","ix":1,"en":1,"ef":[{"ty":3,"nm":"Start of Ramp","mn":"ADBE Ramp-0001","ix":1,"v":{"a":0,"k":[147.614,49.348],"ix":1}},{"ty":2,"nm":"Start Color","mn":"ADBE Ramp-0002","ix":2,"v":{"a":0,"k":[0,0,0,1],"ix":2}},{"ty":3,"nm":"End of Ramp","mn":"ADBE Ramp-0003","ix":3,"v":{"a":0,"k":[120.118,92.364],"ix":3}},{"ty":2,"nm":"End Color","mn":"ADBE Ramp-0004","ix":4,"v":{"a":0,"k":[1,1,1,1],"ix":4}},{"ty":7,"nm":"Ramp Shape","mn":"ADBE Ramp-0005","ix":5,"v":{"a":0,"k":1,"ix":5}},{"ty":0,"nm":"Ramp Scatter","mn":"ADBE Ramp-0006","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Blend With Original","mn":"ADBE Ramp-0007","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":6,"nm":"","mn":"ADBE Ramp-0008","ix":8,"v":0}]}],"sw":320,"sh":120,"sc":"#000000","ip":0,"op":1,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"Layer 2","tt":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.314,0],[0,0],[0,-3.314],[0,0],[3.314,0],[0,0],[0,3.314],[0,0]],"o":[[0,0],[3.314,0],[0,0],[0,3.314],[0,0],[-3.314,0],[0,0],[0,-3.314]],"v":[[-43,-35],[43,-35],[49,-29],[49,29],[43,35],[-43,35],[-49,29],[-49,-29]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.486274510622,0.674509823322,0.972549021244,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"cdds.sys.color.illo-primary-mid","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":"Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,65,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.314,0],[0,0],[0,-3.314],[0,0],[3.314,0],[0,0],[0,3.314],[0,0]],"o":[[0,0],[3.314,0],[0,0],[0,3.314],[0,0],[-3.314,0],[0,0],[0,-3.314]],"v":[[-43,-35],[43,-35],[49,-29],[49,29],[43,35],[-43,35],[-49,29],[-49,-29]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.890196084976,0.890196084976,0.890196084976,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"cdds.sys.color.illo-neutral-low","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-neutral-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0}],"markers":[]}
diff --git a/chrome/browser/resources/autofill/autofill_virtual_card_enroll_dialog.json b/chrome/browser/resources/autofill/autofill_virtual_card_enroll_dialog.json new file mode 100644 index 0000000..4e5bde9a --- /dev/null +++ b/chrome/browser/resources/autofill/autofill_virtual_card_enroll_dialog.json
@@ -0,0 +1 @@ +{"v":"5.9.6","fr":30,"ip":0,"op":1,"w":320,"h":120,"nm":"autofill - virtual card","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 17","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[209.975,63.95,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-5.075,11.75],[-16.275,0.55],[-14.125,-1.6],[-5.075,7.45],[14.125,-11.75],[16.275,-9.6]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.117647059262,0.643137276173,0.274509817362,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-high","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 16","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160,60,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.178,-0.778],[2.044,2.844],[0,3.422],[0,0],[0,0],[0,0],[0,0],[2.044,-2.844]],"o":[[-3.178,-0.778],[-2.044,-2.844],[0,0],[0,0],[0,0],[0,0],[0,3.422],[-2.044,2.844]],"v":[[2,17.567],[-5.833,12.133],[-8.9,2.733],[-8.9,-5.5],[2,-9.6],[12.9,-5.5],[12.9,2.733],[9.833,12.133]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-2.356,-0.8],[-1.533,2.222],[0,2.733],[0,0],[0,0],[0,0],[0,0],[-1.533,-2.222]],"o":[[2.356,-0.8],[1.533,-2.222],[0,0],[0,0],[0,0],[0,0],[0,2.733],[1.533,2.222]],"v":[[2,14.7],[7.833,10.167],[10.133,2.733],[10.133,-3.6],[2,-6.633],[-6.133,-3.6],[-6.133,2.733],[-3.833,10.167]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0]],"o":[[0,0]],"v":[[2,4]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.827450990677,0.890196084976,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 15","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[162.5,64,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,10.407],[-6.514,7.115]],"o":[[2.209,0],[0,0],[0,2.209],[0,0],[-6.514,-7.115],[0,-10.407],[0,0]],"v":[[20.5,-27],[24.5,-23],[24.5,23],[20.5,27],[-14.011,27],[-24.5,0],[-14.011,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.298039227724,0.552941203117,0.964705884457,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-high","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 14","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[126,58.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[2,-0.5],[2,0.5],[-2,0.5],[-2,-0.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 13","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[116,58.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[2,-0.5],[2,0.5],[-2,0.5],[-2,-0.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Layer 12","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[123.5,58.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.5,-5.5],[0.5,-5.5],[0.5,5.5],[-0.5,5.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Layer 11","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[118.5,58.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.5,-5.5],[0.5,-5.5],[0.5,5.5],[-0.5,5.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Layer 10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[141.5,81.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0.828],[-0.828,0],[0,0],[0,-0.828],[0.828,0],[0,0]],"o":[[0,-0.828],[0,0],[0.828,0],[0,0.828],[0,0],[-0.828,0]],"v":[[-8.5,0],[-7,-1.5],[7,-1.5],[8.5,0],[7,1.5],[-7,1.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.486274510622,0.674509823322,0.972549021244,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-mid","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Layer 9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[122.5,81.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0.828],[-0.828,0],[0,0],[0,-0.828],[0.828,0],[0,0]],"o":[[0,-0.828],[0,0],[0.828,0],[0,0.828],[0,0],[-0.828,0]],"v":[[-8.5,0],[-7,-1.5],[7,-1.5],[8.5,0],[7,1.5],[-7,1.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.486274510622,0.674509823322,0.972549021244,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-mid","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Layer 8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[146,73,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.552,0],[0,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0,0.552]],"o":[[0,-0.552],[0,0],[0.552,0],[0,0],[0,0.552],[0,0],[-0.552,0],[0,0]],"v":[[-32,-1],[-31,-2],[31,-2],[32,-1],[32,1],[31,2],[-31,2],[-32,1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.486274510622,0.674509823322,0.972549021244,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-mid","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[121,58.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.552,0],[0,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0,0.552]],"o":[[0,-0.552],[0,0],[0.552,0],[0,0],[0,0.552],[0,0],[-0.552,0],[0,0]],"v":[[-7,-4.5],[-6,-5.5],[6,-5.5],[7,-4.5],[7,4.5],[6,5.5],[-6,5.5],[-7,4.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.890196084976,0.890196084976,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-neutral-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[145.5,64,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-2.209,0],[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.209]],"o":[[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.209],[0,0],[-2.209,0],[0,0]],"v":[[-41.5,-23],[-37.5,-27],[37.5,-27],[41.5,-23],[41.5,23],[37.5,27],[-37.5,27],[-41.5,23]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.658823549747,0.780392169952,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-low","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[178,64,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-22.091],[22.091,0],[0,22.091],[-22.091,0]],"o":[[0,22.091],[-22.091,0],[0,-22.091],[22.091,0]],"v":[[40,0],[0,40],[-40,0],[0,-40]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.827450990677,0.890196084976,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-primary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251,93,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.219,-0.554],[-0.802,-0.318],[-1.397,0],[0,0],[-0.554,0.219],[-0.318,0.802],[0,1.397],[0,0],[0.219,0.554],[0.802,0.318],[1.397,0],[0,0],[0.554,-0.219],[0.318,-0.802],[0,-1.397]],"o":[[0,1.397],[0.318,0.802],[0.554,0.219],[0,0],[1.397,0],[0.802,-0.318],[0.219,-0.554],[0,0],[0,-1.397],[-0.318,-0.802],[-0.554,-0.219],[0,0],[-1.397,0],[-0.802,0.318],[-0.219,0.554],[0,0]],"v":[[-5,0.375],[-4.781,3.025],[-3.025,4.781],[-0.375,5],[0.375,5],[3.025,4.781],[4.781,3.025],[5,0.375],[5,-0.375],[4.781,-3.025],[3.025,-4.781],[0.375,-5],[-0.375,-5],[-3.025,-4.781],[-4.781,-3.025],[-5,-0.375]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[69,39,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.761,0],[0,2.761],[2.761,0],[0,-2.761]],"o":[[2.761,0],[0,-2.761],[-2.761,0],[0,2.761]],"v":[[0,5],[5,0],[0,-5],[-5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.760784327984,0.905882358551,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-secondary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[88.501,23.001,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.5,0.17],[0.72,-0.24],[0.93,-0.68],[0,0],[0,0],[0.32,-0.42],[-0.02,-0.76],[-0.38,-1.09],[0,0],[0,0],[-0.3,-0.43],[-0.73,-0.21],[-1.17,0.02],[0,0],[0,0],[-0.51,0.15],[-0.44,0.61],[-0.35,1.1],[0,0],[0,0],[-0.01,0.52],[0.46,0.61],[0.96,0.66],[0,0],[0,0]],"o":[[-0.93,-0.68],[-0.72,-0.24],[-0.5,0.17],[0,0],[0,0],[-0.96,0.66],[-0.46,0.6],[0.01,0.52],[0,0],[0,0],[0.34,1.09],[0.44,0.62],[0.5,0.15],[0,0],[0,0],[1.16,0.02],[0.73,-0.22],[0.3,-0.43],[0,0],[0,0],[0.38,-1.09],[0.02,-0.76],[-0.32,-0.42],[0,0],[0,0],[0,0]],"v":[[3,-7.631],[1.11,-8.821],[-1.1,-8.821],[-2.99,-7.631],[-5.02,-6.141],[-7.05,-4.751],[-8.81,-3.341],[-9.5,-1.241],[-8.92,0.919],[-8.12,3.189],[-7.39,5.519],[-6.57,7.589],[-4.77,8.869],[-2.52,8.989],[0,8.949],[2.52,8.989],[4.77,8.869],[6.57,7.589],[7.39,5.519],[8.12,3.189],[8.92,0.919],[9.5,-1.241],[8.81,-3.341],[7.05,-4.751],[5.02,-6.141],[2.99,-7.631]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.768627464771,0.933333337307,0.815686285496,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[233,105,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.523,0],[0,5.523],[5.523,0],[0,-5.523]],"o":[[5.523,0],[0,-5.523],[-5.523,0],[0,5.523]],"v":[[0,10],[10,0],[0,-10],[-10,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.768627464771,0.933333337307,0.815686285496,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"cdds.sys.color.illo-tertiary-min","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1,"st":0,"ct":1,"bm":0}],"markers":[]}
diff --git a/chrome/browser/resources/new_tab_page/composebox/composebox.css b/chrome/browser/resources/new_tab_page/composebox/composebox.css index 69ee4cd..0d11751d 100644 --- a/chrome/browser/resources/new_tab_page/composebox/composebox.css +++ b/chrome/browser/resources/new_tab_page/composebox/composebox.css
@@ -127,6 +127,7 @@ var(--color-new-tab-page-composebox-hover); --cr-icon-button-size: 48px; animation: icon-fade-in var(--expand-duration) linear; + color: var(--color-new-tab-page-composebox-upload-button); opacity: 1; }
diff --git a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.cc b/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.cc deleted file mode 100644 index 72769bb3..0000000 --- a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.cc +++ /dev/null
@@ -1,137 +0,0 @@ -// Copyright 2023 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h" - -#include "base/memory/raw_ptr.h" -#include "base/metrics/user_metrics.h" -#include "base/scoped_observation.h" -#include "chrome/browser/android/tab_android.h" -#include "chrome/browser/ui/android/tab_model/tab_model_list.h" -#include "chrome/browser/ui/android/tab_model/tab_model_list_observer.h" -#include "chrome/browser/ui/android/tab_model/tab_model_observer.h" -#include "components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher.h" -#include "components/segmentation_platform/embedder/tab_fetcher.h" -#include "components/segmentation_platform/public/constants.h" -#include "components/segmentation_platform/public/segmentation_platform_service.h" - -namespace segmentation_platform { - -class TabDataCollectionUtil::LocalTabModelObserver : public TabModelObserver { - public: - explicit LocalTabModelObserver(TabDataCollectionUtil* collection_util) - : collection_util_(collection_util) {} - ~LocalTabModelObserver() override = default; - - void DidSelectTab(TabAndroid* tab, TabModel::TabSelectionType type) override { - collection_util_->OnTabAction(tab, TabAction::kTabSelected); - } - void TabPendingClosure(TabAndroid* tab, - TabModel::TabClosingSource source) override { - collection_util_->OnTabAction(tab, TabAction::kTabClose); - } - void AllTabsPendingClosure( - const std::vector<raw_ptr<TabAndroid, VectorExperimental>>& tabs) - override { - for (const TabAndroid* tab : tabs) { - collection_util_->OnTabAction(tab, TabAction::kTabClose); - } - } - - private: - const raw_ptr<TabDataCollectionUtil> collection_util_; -}; - -class TabDataCollectionUtil::LocalTabModelListObserver - : public TabModelListObserver { - public: - LocalTabModelListObserver(LocalTabModelObserver* tab_observer, - TabDataCollectionUtil* collection_util) - : tab_observer_(tab_observer), collection_util_(collection_util) { - ResetObservers(); - } - ~LocalTabModelListObserver() override = default; - - void OnTabModelAdded(TabModel* tab_model) override { ResetObservers(); } - void OnTabModelRemoved(TabModel* tab_model) override { ResetObservers(); } - - void ResetObservers() { - observing_models_.clear(); - for (TabModel* model : TabModelList::models()) { - observing_models_.emplace_back( - std::make_unique<TabModelObservation>(tab_observer_.get())); - observing_models_.back()->Observe(model); - } - } - - private: - using TabModelObservation = - base::ScopedObservation<TabModel, TabModelObserver>; - const raw_ptr<LocalTabModelObserver> tab_observer_; - const raw_ptr<TabDataCollectionUtil> collection_util_; - std::vector<std::unique_ptr<TabModelObservation>> observing_models_; -}; - -TabDataCollectionUtil::TabDataCollectionUtil( - SegmentationPlatformService* segmentation_service, - TabRankDispatcher* tab_rank_dispatcher) - : segmentation_service_(segmentation_service), - tab_rank_dispatcher_(tab_rank_dispatcher), - tab_observer_(std::make_unique<LocalTabModelObserver>(this)), - tab_model_list_observer_( - std::make_unique<LocalTabModelListObserver>(tab_observer_.get(), - this)) { - TabModelList::AddObserver(tab_model_list_observer_.get()); - base::AddActionCallback(base::BindRepeating( - &TabDataCollectionUtil::OnUserAction, weak_ptr_factory_.GetWeakPtr())); -} - -TabDataCollectionUtil::~TabDataCollectionUtil() { - TabModelList::RemoveObserver(tab_model_list_observer_.get()); -} - -void TabDataCollectionUtil::OnTabAction(const TabAndroid* tab, - TabAction tab_action) { - auto it = tab_requests_.find(tab); - if (it != tab_requests_.end()) { - TrainingLabels labels; - labels.output_metric = - std::make_pair("TabAction", static_cast<int>(tab_action)); - segmentation_service_->CollectTrainingData( - proto::SegmentId::TAB_RESUMPTION_CLASSIFIER, it->second, labels, - base::DoNothing()); - } -} - -void TabDataCollectionUtil::OnUserAction(const std::string& action, - base::TimeTicks time) { - if (action != "MobileToolbarShowStackView") { - return; - } - // Filter only local tabs, with TabAndroid object usable. - auto filter = base::BindRepeating( - [](const TabFetcher::Tab& tab) { return !!tab.tab_android; }); - tab_rank_dispatcher_->GetTopRankedTabs( - kTabResumptionClassifierKey, TabRankDispatcher::TabFilter(), - base::BindOnce(&TabDataCollectionUtil::OnGetRankedTabs, - weak_ptr_factory_.GetWeakPtr())); -} - -void TabDataCollectionUtil::OnGetRankedTabs( - bool success, - std::multiset<TabRankDispatcher::RankedTab> ranked_tabs) { - if (!success) { - return; - } - tab_requests_.clear(); - auto* fetcher = tab_rank_dispatcher_->tab_fetcher(); - for (const auto& candidate : ranked_tabs) { - auto tab = fetcher->FindTab(candidate.tab); - if (tab.tab_android) { - tab_requests_[tab.tab_android] = candidate.request_id; - } - } -} - -} // namespace segmentation_platform
diff --git a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h b/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h deleted file mode 100644 index 159e425..0000000 --- a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h +++ /dev/null
@@ -1,59 +0,0 @@ -// Copyright 2023 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_SEGMENTATION_PLATFORM_CLIENT_UTIL_TAB_DATA_COLLECTION_UTIL_H_ -#define CHROME_BROWSER_SEGMENTATION_PLATFORM_CLIENT_UTIL_TAB_DATA_COLLECTION_UTIL_H_ - -#include <string> -#include "base/memory/raw_ptr.h" -#include "base/memory/weak_ptr.h" -#include "base/supports_user_data.h" -#include "base/time/time.h" -#include "components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher.h" -#include "components/segmentation_platform/public/segmentation_platform_service.h" -#include "components/segmentation_platform/public/trigger.h" - -namespace segmentation_platform { - -// Collection utility that ranks tabs and uploads training data about tab. -class TabDataCollectionUtil : public base::SupportsUserData::Data { - public: - TabDataCollectionUtil(SegmentationPlatformService* segmentation_service, - TabRankDispatcher* tab_rank_dispatcher); - ~TabDataCollectionUtil() override; - - TabDataCollectionUtil(const TabDataCollectionUtil&) = delete; - TabDataCollectionUtil& operator=(const TabDataCollectionUtil&) = delete; - - private: - class LocalTabModelListObserver; - class LocalTabModelObserver; - - // Represents the real output with action taken on the tab. - enum TabAction : int { - kUnknown, - kTabSelected, - kTabClose, - }; - void OnTabAction(const TabAndroid* tab, TabAction tab_action); - - void OnUserAction(const std::string& action, base::TimeTicks time); - - void OnGetRankedTabs(bool success, - std::multiset<TabRankDispatcher::RankedTab> ranked_tabs); - - const raw_ptr<SegmentationPlatformService> segmentation_service_; - const raw_ptr<TabRankDispatcher> tab_rank_dispatcher_; - - std::unique_ptr<LocalTabModelObserver> tab_observer_; - std::unique_ptr<LocalTabModelListObserver> tab_model_list_observer_; - - std::map<const TabAndroid*, TrainingRequestId> tab_requests_; - - base::WeakPtrFactory<TabDataCollectionUtil> weak_ptr_factory_{this}; -}; - -} // namespace segmentation_platform - -#endif // CHROME_BROWSER_SEGMENTATION_PLATFORM_CLIENT_UTIL_TAB_DATA_COLLECTION_UTIL_H_
diff --git a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util_unittest.cc b/chrome/browser/segmentation_platform/client_util/tab_data_collection_util_unittest.cc deleted file mode 100644 index b66a307..0000000 --- a/chrome/browser/segmentation_platform/client_util/tab_data_collection_util_unittest.cc +++ /dev/null
@@ -1,177 +0,0 @@ -// Copyright 2023 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h" - -#include <memory> - -#include "base/metrics/user_metrics.h" -#include "base/metrics/user_metrics_action.h" -#include "base/run_loop.h" -#include "base/task/single_thread_task_runner.h" -#include "base/test/gmock_callback_support.h" -#include "chrome/browser/ui/android/tab_model/tab_model.h" -#include "chrome/browser/ui/android/tab_model/tab_model_list.h" -#include "chrome/browser/ui/android/tab_model/tab_model_observer.h" -#include "chrome/browser/ui/android/tab_model/tab_model_test_helper.h" -#include "chrome/test/base/testing_profile.h" -#include "components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher.h" -#include "components/segmentation_platform/embedder/tab_fetcher.h" -#include "components/segmentation_platform/public/constants.h" -#include "components/segmentation_platform/public/proto/segmentation_platform.pb.h" -#include "components/segmentation_platform/public/segmentation_platform_service.h" -#include "components/segmentation_platform/public/testing/mock_segmentation_platform_service.h" -#include "components/segmentation_platform/public/trigger.h" -#include "components/sessions/core/session_id.h" -#include "content/public/test/browser_task_environment.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace segmentation_platform { -namespace { - -using ::base::test::RunOnceCallback; -using ::testing::_; -using ::testing::Return; - -class MockRankDispatcher : public TabRankDispatcher { - public: - MockRankDispatcher(SegmentationPlatformService* service, - sync_sessions::SessionSyncService* session_sync_service, - std::unique_ptr<TabFetcher> fetcher) - : TabRankDispatcher(service, session_sync_service, std::move(fetcher)) {} - - MOCK_METHOD(void, - GetTopRankedTabs, - (const std::string& segmentation_key, - const TabFilter& tab_filter, - RankedTabsCallback callback), - (override)); -}; - -class MockSessionSyncService : public sync_sessions::SessionSyncService { - public: - MockSessionSyncService() = default; - ~MockSessionSyncService() override = default; - - MOCK_METHOD(syncer::GlobalIdMapper*, - GetGlobalIdMapper, - (), - (const, override)); - MOCK_METHOD(sync_sessions::OpenTabsUIDelegate*, - GetOpenTabsUIDelegate, - (), - (override)); - MOCK_METHOD(base::CallbackListSubscription, - SubscribeToForeignSessionsChanged, - (const base::RepeatingClosure& cb), - (override)); - MOCK_METHOD(base::WeakPtr<syncer::DataTypeControllerDelegate>, - GetControllerDelegate, - ()); -}; - -class MockTabFecther : public TabFetcher { - public: - explicit MockTabFecther(MockSessionSyncService* session_sync_service) - : TabFetcher(session_sync_service) {} - - MOCK_METHOD(bool, - FillAllLocalTabsFromTabModel, - (std::vector<TabEntry> & tabs), - (override)); - MOCK_METHOD(Tab, FindLocalTab, (const TabEntry& entry), (override)); -}; - -} // namespace - -class TabDataCollectionUtilTest : public testing::Test { - public: - TabDataCollectionUtilTest() = default; - ~TabDataCollectionUtilTest() override = default; - - void SetUp() override { - Test::SetUp(); - base::SetRecordActionTaskRunner( - base::SingleThreadTaskRunner::GetCurrentDefault()); - tab_model_ = std::make_unique<TestTabModel>(&profile_); - segmentation_service_ = std::make_unique<MockSegmentationPlatformService>(); - auto tab_fetcher = std::make_unique<MockTabFecther>(&session_sync_service_); - tab_fetcher_ = tab_fetcher.get(); - rank_dispatcher_ = std::make_unique<MockRankDispatcher>( - segmentation_service_.get(), &session_sync_service_, - std::move(tab_fetcher)); - collection_util_ = std::make_unique<TabDataCollectionUtil>( - segmentation_service_.get(), rank_dispatcher_.get()); - } - - void TearDown() override { Test::TearDown(); } - - protected: - content::BrowserTaskEnvironment task_environment_; - TestingProfile profile_; - std::unique_ptr<TestTabModel> tab_model_; - MockSessionSyncService session_sync_service_; - raw_ptr<MockTabFecther> tab_fetcher_; - std::unique_ptr<MockSegmentationPlatformService> segmentation_service_; - std::unique_ptr<MockRankDispatcher> rank_dispatcher_; - std::unique_ptr<TabDataCollectionUtil> collection_util_; -}; - -TEST_F(TabDataCollectionUtilTest, AddRemoveTabModel) { - ASSERT_FALSE(tab_model_->GetObserver()); - TabModelList::AddTabModel(tab_model_.get()); - ASSERT_TRUE(tab_model_->GetObserver()); - TabModelList::RemoveTabModel(tab_model_.get()); - ASSERT_FALSE(tab_model_->GetObserver()); - - auto other_tab_model = std::make_unique<TestTabModel>(&profile_); - TabModelList::AddTabModel(other_tab_model.get()); - ASSERT_FALSE(tab_model_->GetObserver()); - ASSERT_TRUE(other_tab_model->GetObserver()); - - TabModelList::AddTabModel(tab_model_.get()); - ASSERT_TRUE(tab_model_->GetObserver()); - ASSERT_TRUE(other_tab_model->GetObserver()); - - TabModelList::RemoveTabModel(tab_model_.get()); - TabModelList::RemoveTabModel(other_tab_model.get()); - ASSERT_FALSE(tab_model_->GetObserver()); - ASSERT_FALSE(other_tab_model->GetObserver()); -} - -TEST_F(TabDataCollectionUtilTest, RecordTrainingData) { - TabModelList::AddTabModel(tab_model_.get()); - ASSERT_TRUE(tab_model_->GetObserver()); - - TabAndroid* fake_tab_ptr = reinterpret_cast<TabAndroid*>(1); - EXPECT_CALL(*tab_fetcher_, FindLocalTab(_)) - .WillOnce(Return(TabFetcher::Tab{.tab_android = fake_tab_ptr})); - TrainingRequestId id1 = TrainingRequestId::FromUnsafeValue(5); - TabFetcher::TabEntry entry(SessionID::NewUnique(), nullptr, fake_tab_ptr); - TabRankDispatcher::RankedTab tab1{ - .tab = entry, .model_score = 0.5, .request_id = id1}; - std::multiset<TabRankDispatcher::RankedTab> tabs{tab1}; - EXPECT_CALL(*rank_dispatcher_, - GetTopRankedTabs(kTabResumptionClassifierKey, _, _)) - .WillOnce(RunOnceCallback<2>(true, tabs)); - - base::RunLoop wait_for_collection; - EXPECT_CALL(*segmentation_service_, - CollectTrainingData(proto::SegmentId::TAB_RESUMPTION_CLASSIFIER, - id1, _, _)) - .WillOnce([&wait_for_collection]( - proto::SegmentId segment_id, TrainingRequestId request_id, - const TrainingLabels& param, - SegmentationPlatformService::SuccessCallback callback) { - wait_for_collection.QuitClosure().Run(); - }); - base::RecordAction(base::UserMetricsAction("MobileToolbarShowStackView")); - tab_model_->GetObserver()->TabPendingClosure( - fake_tab_ptr, TabModel::TabClosingSource::UNKNOWN); - wait_for_collection.Run(); - - TabModelList::RemoveTabModel(tab_model_.get()); -} - -} // namespace segmentation_platform
diff --git a/chrome/browser/segmentation_platform/segmentation_platform_service_factory.cc b/chrome/browser/segmentation_platform/segmentation_platform_service_factory.cc index c8b1bdab..53291e4 100644 --- a/chrome/browser/segmentation_platform/segmentation_platform_service_factory.cc +++ b/chrome/browser/segmentation_platform/segmentation_platform_service_factory.cc
@@ -49,10 +49,6 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" -#if BUILDFLAG(IS_ANDROID) -#include "chrome/browser/segmentation_platform/client_util/tab_data_collection_util.h" -#endif - namespace segmentation_platform { namespace { const char kSegmentationPlatformProfileObserverKey[] = @@ -92,17 +88,6 @@ std::unique_ptr<TabFetcher> tab_fetcher) { auto rank_dispatcher = std::make_unique<TabRankDispatcher>( service, session_sync_service, std::move(tab_fetcher)); -#if BUILDFLAG(IS_ANDROID) - if (base::FeatureList::IsEnabled( - features::kSegmentationPlatformCollectTabRankData)) { - const char kSegmentationTabDataCollectionUtilUserDataKey[] = - "segmentation_tab_tab_data_collection_util"; - auto tab_collection_util = - std::make_unique<TabDataCollectionUtil>(service, rank_dispatcher.get()); - service->SetUserData(kSegmentationTabDataCollectionUtilUserDataKey, - std::move(tab_collection_util)); - } -#endif service->SetUserData(kSegmentationTabRankDispatcherUserDataKey, std::move(rank_dispatcher)); }
diff --git a/chrome/browser/sharesheet/share_action/share_action_cache.cc b/chrome/browser/sharesheet/share_action/share_action_cache.cc index 4acd641..c55ff455 100644 --- a/chrome/browser/sharesheet/share_action/share_action_cache.cc +++ b/chrome/browser/sharesheet/share_action/share_action_cache.cc
@@ -73,7 +73,15 @@ } void ShareActionCache::AddShareActionForTest(ShareActionType type) { - AddShareAction(std::make_unique<ExampleAction>(type)); + switch (type) { + // If you need a real action implementation for the action type, add it + // here. + case ShareActionType::kDriveShare: + AddShareAction(std::make_unique<ash::sharesheet::DriveShareAction>()); + break; + default: + AddShareAction(std::make_unique<ExampleAction>(type)); + } } void ShareActionCache::AddShareAction(std::unique_ptr<ShareAction> action) {
diff --git a/chrome/browser/sharesheet/sharesheet_service.cc b/chrome/browser/sharesheet/sharesheet_service.cc index e04b8c1..a18d754 100644 --- a/chrome/browser/sharesheet/sharesheet_service.cc +++ b/chrome/browser/sharesheet/sharesheet_service.cc
@@ -229,11 +229,11 @@ LaunchSource source, DeliveredCallback delivered_callback, CloseCallback close_callback, - int num_actions_to_add) { + std::vector<::sharesheet::ShareActionType> actions) { CHECK(views::Widget::GetWidgetForNativeWindow(native_window)); SharesheetMetrics::RecordSharesheetLaunchSource(source); - for (int i = 0; i < num_actions_to_add; ++i) { - share_action_cache_->AddShareActionForTest(); // IN-TEST + for (auto action : actions) { + share_action_cache_->AddShareActionForTest(action); // IN-TEST } auto targets = GetActionsForIntent(intent); OnReadyToShowBubble(native_window, std::move(intent),
diff --git a/chrome/browser/sharesheet/sharesheet_service.h b/chrome/browser/sharesheet/sharesheet_service.h index 17d390d..a02cd91 100644 --- a/chrome/browser/sharesheet/sharesheet_service.h +++ b/chrome/browser/sharesheet/sharesheet_service.h
@@ -136,7 +136,7 @@ LaunchSource source, DeliveredCallback delivered_callback, CloseCallback close_callback, - int num_actions_to_add); + std::vector<::sharesheet::ShareActionType> actions); SharesheetUiDelegate* GetUiDelegateForTesting( gfx::NativeWindow native_window); static void SetSelectedAppForTesting(const std::u16string& target_name);
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index ee1c42ea..95bef7d 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1078,42 +1078,21 @@ "passwords/passwords_model_delegate.cc", "passwords/passwords_model_delegate.h", "performance_controls/battery_saver_bubble_delegate.cc", - "performance_controls/battery_saver_bubble_delegate.h", - "performance_controls/battery_saver_bubble_observer.h", "performance_controls/battery_saver_button_controller.cc", - "performance_controls/battery_saver_button_controller.h", - "performance_controls/battery_saver_button_controller_delegate.h", "performance_controls/memory_saver_bubble_controller.cc", - "performance_controls/memory_saver_bubble_controller.h", "performance_controls/memory_saver_bubble_delegate.cc", - "performance_controls/memory_saver_bubble_delegate.h", - "performance_controls/memory_saver_bubble_observer.h", "performance_controls/memory_saver_chip_controller.cc", - "performance_controls/memory_saver_chip_controller.h", "performance_controls/memory_saver_chip_tab_helper.cc", - "performance_controls/memory_saver_chip_tab_helper.h", "performance_controls/memory_saver_opt_in_iph_controller.cc", - "performance_controls/memory_saver_opt_in_iph_controller.h", "performance_controls/memory_saver_utils.cc", - "performance_controls/memory_saver_utils.h", "performance_controls/performance_controls_hats_service.cc", - "performance_controls/performance_controls_hats_service.h", "performance_controls/performance_controls_hats_service_factory.cc", - "performance_controls/performance_controls_hats_service_factory.h", "performance_controls/performance_controls_metrics.cc", - "performance_controls/performance_controls_metrics.h", "performance_controls/performance_intervention_bubble_delegate.cc", - "performance_controls/performance_intervention_bubble_delegate.h", - "performance_controls/performance_intervention_bubble_observer.h", "performance_controls/performance_intervention_button_controller.cc", - "performance_controls/performance_intervention_button_controller.h", - "performance_controls/performance_intervention_button_controller_delegate.h", "performance_controls/tab_list_model.cc", - "performance_controls/tab_list_model.h", "performance_controls/tab_resource_usage_collector.cc", - "performance_controls/tab_resource_usage_collector.h", "performance_controls/tab_resource_usage_tab_helper.cc", - "performance_controls/tab_resource_usage_tab_helper.h", "profiles/profile_colors_util.cc", "profiles/profile_colors_util.h", "profiles/profile_view_utils.cc", @@ -1594,6 +1573,7 @@ "//chrome/browser/lifetime:termination_notification", "//chrome/browser/privacy_sandbox/notice:desktop_entrypoint_handlers_helper", "//chrome/browser/privacy_sandbox/notice:notice_mojom", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/search", "//chrome/browser/ui/search:impl", "//chrome/browser/ui/search_engine_choice", @@ -1802,8 +1782,9 @@ "//ui/webui/resources/js/metrics_reporter:mojo_bindings", # TODO(crbug.com/428666921): When the headers of chrome/browser/ui/performance_controls - # get componentized, this dependency can be removed from here, and moved there. + # get componentized, these dependencies can be removed from here, and moved there. "//chrome/browser/performance_manager/public/user_tuning", + "//chrome/browser/resource_coordinator", ] # Non-android public_deps for "ui" target. @@ -2153,7 +2134,6 @@ "//chrome/browser/ash/app_list", "//chrome/browser/ash/app_list/app_service", "//chrome/browser/ash/app_list/arc", - "//chrome/browser/ash/app_list/chat", "//chrome/browser/ash/app_list/reorder", "//chrome/browser/ash/app_list/search", "//chrome/browser/ash/app_list/search/arc", @@ -2680,7 +2660,6 @@ "//chrome/browser/ash/app_list", "//chrome/browser/ash/app_list/app_service", "//chrome/browser/ash/app_list/arc", - "//chrome/browser/ash/app_list/chat", "//chrome/browser/ash/app_list/reorder", "//chrome/browser/ash/app_list/search", "//chrome/browser/ash/app_list/search/arc", @@ -3450,6 +3429,7 @@ deps += [ "//chrome/browser:titlebar_config", + "//chrome/browser/ui/startup/default_browser_prompt/pin_infobar", "//chrome/browser/win:mica_titlebar", "//chrome/browser/win/conflicts:module_info", "//chrome/credential_provider/common:common_constants", @@ -3908,7 +3888,6 @@ "views/extensions/extension_keybinding_registry_views.h", "views/extensions/extension_permissions_view.cc", "views/extensions/extension_permissions_view.h", - "views/extensions/extension_uninstall_dialog_view.cc", "views/extensions/extension_view_utils.cc", "views/extensions/extension_view_utils.h", "views/extensions/extensions_menu_button.cc", @@ -5227,6 +5206,7 @@ if (enable_extensions_core) { sources += [ "extensions/extension_dialog_utils.h", + "extensions/extension_uninstall_dialog_impl.cc", "webui/extensions/extension_icon_source.cc", "webui/extensions/extension_icon_source.h", "webui/extensions/extensions_internals_source.cc",
diff --git a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinator.java b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinator.java index a5b73c93..c4694f7 100644 --- a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinator.java +++ b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinator.java
@@ -46,6 +46,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; import org.chromium.ui.modaldialog.ModalDialogProperties; +import org.chromium.ui.modaldialog.ModalDialogProperties.ButtonStyles; import org.chromium.ui.modelutil.MVCListAdapter.ListItem; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; import org.chromium.ui.modelutil.ModelListAdapter; @@ -307,7 +308,10 @@ R.string.cancel) .with( ModalDialogProperties.DIALOG_STYLES, - ModalDialogProperties.DialogStyles.DIALOG_WHEN_LARGE); + ModalDialogProperties.DialogStyles.DIALOG_WHEN_LARGE) + .with( + ModalDialogProperties.BUTTON_STYLES, + ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE); if (UiUtils.isInstanceSwitcherV2Enabled()) { builder.with(
diff --git a/chrome/browser/ui/ash/session/BUILD.gn b/chrome/browser/ui/ash/session/BUILD.gn index 80dc2b0..dc0ccd7 100644 --- a/chrome/browser/ui/ash/session/BUILD.gn +++ b/chrome/browser/ui/ash/session/BUILD.gn
@@ -93,6 +93,7 @@ "//chromeos/ash/components/login/login_state", "//chromeos/ash/components/login/session", "//components/account_id", + "//components/account_id:test_support", "//components/prefs", "//components/session_manager/core", "//components/user_manager",
diff --git a/chrome/browser/ui/ash/session/session_controller_client_impl.cc b/chrome/browser/ui/ash/session/session_controller_client_impl.cc index b1516a5..49581695 100644 --- a/chrome/browser/ui/ash/session/session_controller_client_impl.cc +++ b/chrome/browser/ui/ash/session/session_controller_client_impl.cc
@@ -452,15 +452,16 @@ } UserManager* const user_manager = UserManager::Get(); - if (user_manager->GetUsersAllowedForMultiUserSignIn().empty()) { - return ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS; - } if (user_manager::GetMultiUserSignInPolicy(user_manager->GetPrimaryUser()) == user_manager::MultiUserSignInPolicy::kNotAllowed) { return ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER; } + if (user_manager->GetUsersAllowedForMultiUserSignIn().empty()) { + return ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS; + } + if (user_manager->GetLoggedInUsers().size() >= session_manager::kMaximumNumberOfUserSessions) { return ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED;
diff --git a/chrome/browser/ui/ash/session/session_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/session/session_controller_client_impl_unittest.cc index 595d3c4..bf6d762 100644 --- a/chrome/browser/ui/ash/session/session_controller_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/session/session_controller_client_impl_unittest.cc
@@ -16,8 +16,9 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/time/time.h" -#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" +#include "chrome/browser/ash/login/users/scoped_account_id_annotator.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" #include "chrome/browser/policy/networking/policy_cert_service.h" @@ -30,12 +31,16 @@ #include "chrome/test/base/testing_profile_manager.h" #include "chromeos/ash/components/login/login_state/login_state.h" #include "chromeos/ash/components/login/session/session_termination_manager.h" +#include "chromeos/ash/components/settings/cros_settings.h" #include "components/account_id/account_id.h" +#include "components/account_id/account_id_literal.h" #include "components/prefs/pref_service.h" #include "components/session_manager/core/session_manager.h" +#include "components/user_manager/fake_user_manager_delegate.h" #include "components/user_manager/multi_user/multi_user_sign_in_policy.h" #include "components/user_manager/multi_user/multi_user_sign_in_policy_controller.h" #include "components/user_manager/scoped_user_manager.h" +#include "components/user_manager/test_helper.h" #include "components/user_manager/user_manager.h" #include "components/user_manager/user_manager_pref_names.h" #include "content/public/test/browser_task_environment.h" @@ -49,8 +54,12 @@ namespace { -constexpr char kUser[] = "user@test.com"; -constexpr GaiaId::Literal kUserGaiaId("0123456789"); +constexpr auto kTestUserId = + AccountId::Literal::FromUserEmailGaiaId("user@test.com", + GaiaId::Literal("0123456789")); +constexpr auto kOtherTestUserId = + AccountId::Literal::FromUserEmailGaiaId("other@test.com", + GaiaId::Literal("9876543210")); std::unique_ptr<KeyedService> CreateTestPolicyCertService( content::BrowserContext* context) { @@ -72,10 +81,14 @@ ~SessionControllerClientImplTest() override = default; void SetUp() override { + cros_settings_test_helper_ = + std::make_unique<ash::ScopedCrosSettingsTestHelper>(); ash::LoginState::Initialize(); session_manager_ = std::make_unique<session_manager::SessionManager>(); // Initialize the UserManager singleton. - user_manager_.Reset(std::make_unique<ash::FakeChromeUserManager>()); + user_manager_.Reset(std::make_unique<user_manager::UserManagerImpl>( + std::make_unique<user_manager::FakeUserManagerDelegate>(), + g_browser_process->local_state(), ash::CrosSettings::Get())); session_manager_->OnUserManagerCreated(user_manager_.Get()); // Initialize AssistantBrowserDelegate singleton. assistant_delegate_ = std::make_unique<AssistantBrowserDelegateImpl>(); @@ -83,13 +96,9 @@ profile_manager_ = std::make_unique<TestingProfileManager>( TestingBrowserProcess::GetGlobal()); ASSERT_TRUE(profile_manager_->SetUp()); - - cros_settings_test_helper_ = - std::make_unique<ash::ScopedCrosSettingsTestHelper>(); } void TearDown() override { - cros_settings_test_helper_.reset(); for (user_manager::User* user : user_manager_->GetPersistedUsers()) { user_manager_->OnUserProfileWillBeDestroyed(user->GetAccountId()); @@ -109,27 +118,37 @@ user_manager_.Reset(); ash::LoginState::Shutdown(); + cros_settings_test_helper_.reset(); } - // Add and log in a user to the session. - void UserAddedToSession(const AccountId& account_id, bool is_child = false) { - const user_manager::User* user = - is_child ? user_manager()->AddChildUser(account_id) - : user_manager()->AddUser(account_id); + // Registers a user with the given `account_id` and `user_type`. + // Currently, only regular and child users are supported. + [[nodiscard]] user_manager::User* RegisterUser( + const AccountId& account_id, + user_manager::UserType user_type = user_manager::UserType::kRegular) { + user_manager::TestHelper test_helper(user_manager_.Get()); + switch (user_type) { + case user_manager::UserType::kRegular: + return test_helper.AddRegularUser(account_id); + case user_manager::UserType::kChild: + return test_helper.AddChildUser(account_id); + default: + NOTREACHED(); + } + } + + TestingProfile* LogIn(const AccountId& account_id) { session_manager_->CreateSession( - account_id, - // TODO(crbug.com/278643115): Looks incorrect. - // User's username_hash should be set inside CreateSession via - // UserManager::UserLoggedIn(). - user->username_hash(), + account_id, user_manager::TestHelper::GetFakeUsernameHash(account_id), /*new_user=*/false, /*has_active_session=*/false); // Simulate that user profile is loaded. - CreateTestingProfile(user); + auto* result = CreateTestingProfile(account_id); session_manager_->NotifyUserProfileLoaded(account_id); session_manager_->SetSessionState(SessionState::ACTIVE); + return result; } // Get the active user. @@ -140,27 +159,18 @@ .GetUserEmail(); } - ash::FakeChromeUserManager* user_manager() { return user_manager_.Get(); } - - // Adds a regular user with a profile. - TestingProfile* InitForMultiProfile() { - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - const user_manager::User* user = user_manager()->AddUser(account_id); - - // Note that user profiles are created after user login in reality. - return CreateTestingProfile(user); - } - // Calls private methods to create a testing profile. The created profile // is owned by ProfileManager. - TestingProfile* CreateTestingProfile(const user_manager::User* user) { - const AccountId& account_id = user->GetAccountId(); - TestingProfile* profile = - profile_manager_->CreateTestingProfile(account_id.GetUserEmail()); - profile->set_profile_name(account_id.GetUserEmail()); - user_manager()->OnUserProfileCreated(account_id, profile->GetPrefs()); - ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile); + TestingProfile* CreateTestingProfile(const AccountId& account_id) { + TestingProfile* profile = nullptr; + { + ash::ScopedAccountIdAnnotator account_id_annotator( + profile_manager_->profile_manager(), account_id); + profile = + profile_manager_->CreateTestingProfile(account_id.GetUserEmail()); + } + user_manager::UserManager::Get()->OnUserProfileCreated(account_id, + profile->GetPrefs()); return profile; } @@ -176,8 +186,7 @@ ScopedTestingLocalState local_state_{TestingBrowserProcess::GetGlobal()}; ash::SessionTerminationManager session_termination_manager_; content::BrowserTaskEnvironment task_environment_; - user_manager::TypedScopedUserManager<ash::FakeChromeUserManager> - user_manager_; + user_manager::ScopedUserManager user_manager_; std::unique_ptr<session_manager::SessionManager> session_manager_; std::unique_ptr<AssistantBrowserDelegateImpl> assistant_delegate_; std::unique_ptr<TestingProfileManager> profile_manager_; @@ -186,8 +195,10 @@ // Make sure that cycling one user does not cause any harm. TEST_F(SessionControllerClientImplTest, CyclingOneUser) { - UserAddedToSession(AccountId::FromUserEmailGaiaId("firstuser@test.com", - GaiaId("1111111111"))); + const auto account_id = AccountId::FromUserEmailGaiaId("firstuser@test.com", + GaiaId("1111111111")); + ASSERT_TRUE(RegisterUser(account_id)); + LogIn(account_id); EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); SessionControllerClientImpl::DoCycleActiveUser(ash::CycleUserDirection::NEXT); @@ -211,10 +222,15 @@ "seconduser@test.com", GaiaId("2222222222")); const AccountId third_user = AccountId::FromUserEmailGaiaId( "thirduser@test.com", GaiaId("3333333333")); - UserAddedToSession(first_user); - UserAddedToSession(second_user); - UserAddedToSession(third_user); - user_manager()->SwitchActiveUser(first_user); + ASSERT_TRUE(RegisterUser(first_user)); + ASSERT_TRUE(RegisterUser(second_user)); + ASSERT_TRUE(RegisterUser(third_user)); + + LogIn(first_user); + LogIn(second_user); + LogIn(third_user); + + session_manager().SwitchActiveSession(first_user); // Cycle forward. const ash::CycleUserDirection forward = ash::CycleUserDirection::NEXT; @@ -236,21 +252,36 @@ EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); } -// Make sure MultiProfile disabled by primary user policy. -TEST_F(SessionControllerClientImplTest, MultiProfileDisallowedByUserPolicy) { - TestingProfile* user_profile = InitForMultiProfile(); +TEST_F(SessionControllerClientImplTest, MultiUserNoLogin) { + ASSERT_TRUE(RegisterUser(kTestUserId)); EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, SessionControllerClientImpl::GetAddUserSessionPolicy()); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); +} + +TEST_F(SessionControllerClientImplTest, MultiUserSingleUser) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + LogIn(kTestUserId); + + // Because the only registered user already logged in. EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, SessionControllerClientImpl::GetAddUserSessionPolicy()); +} - user_manager()->AddUser( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); +TEST_F(SessionControllerClientImplTest, MultiUserMultiUsers) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); + + LogIn(kTestUserId); + // kOtherTestUserId can still log in. EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, SessionControllerClientImpl::GetAddUserSessionPolicy()); +} + +// Make sure MultiUser disabled by primary user policy. +TEST_F(SessionControllerClientImplTest, MultiUserDisallowedByUserPolicy) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); + TestingProfile* user_profile = LogIn(kTestUserId); user_profile->GetPrefs()->SetString( user_manager::prefs::kMultiProfileUserBehaviorPref, @@ -260,34 +291,27 @@ SessionControllerClientImpl::GetAddUserSessionPolicy()); } -// Make sure MultiProfile is disabled for Family Link users. -TEST_F(SessionControllerClientImplTest, - MultiProfileDisallowedForFamilyLinkUsers) { - InitForMultiProfile(); - EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, - SessionControllerClientImpl::GetAddUserSessionPolicy()); +// Make sure MultiUser is disabled for Family Link users. +TEST_F(SessionControllerClientImplTest, MultiUserDisallowedForFamilyLinkUsers) { + constexpr auto kChildUserId = AccountId::Literal::FromUserEmailGaiaId( + "child@gmail.com", GaiaId::Literal("12345678")); + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kChildUserId, user_manager::UserType::kChild)); - const AccountId account_id( - AccountId::FromUserEmailGaiaId("child@gmail.com", GaiaId("12345678"))); - UserAddedToSession(account_id, /*is_child=*/true); + LogIn(kChildUserId); EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, SessionControllerClientImpl::GetAddUserSessionPolicy()); } -// Make sure MultiProfile is allowed if the primary user has used +// Make sure MultiUser is allowed if the primary user has used // policy-provided trust anchors. TEST_F(SessionControllerClientImplTest, - MultiProfileAllowedWithPolicyCertificates) { - TestingProfile* user_profile = InitForMultiProfile(); - user_manager()->AddUser( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); + MultiUserAllowedWithPolicyCertificates) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); - EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, - SessionControllerClientImpl::GetAddUserSessionPolicy()); + TestingProfile* user_profile = LogIn(kTestUserId); ASSERT_TRUE( policy::PolicyCertServiceFactory::GetInstance()->SetTestingFactoryAndUse( @@ -300,17 +324,15 @@ base::RunLoop().RunUntilIdle(); } -// Make sure MultiProfile is allowed if the primary user has policy-provided +// Make sure MultiUser is allowed if the primary user has policy-provided // trust anchors in memory. TEST_F(SessionControllerClientImplTest, - MultiProfileDisallowedByPrimaryUserCertificatesInMemory) { - TestingProfile* user_profile = InitForMultiProfile(); - user_manager()->AddUser( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); + MultiUserDisallowedByPrimaryUserCertificatesInMemory) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); + TestingProfile* user_profile = LogIn(kTestUserId); + EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, SessionControllerClientImpl::GetAddUserSessionPolicy()); ASSERT_TRUE( @@ -336,56 +358,53 @@ // Make sure adding users to multiprofiles disabled by reaching maximum // number of users in sessions. TEST_F(SessionControllerClientImplTest, - AddUserToMultiprofileDisallowedByMaximumUsers) { - InitForMultiProfile(); + AddUserToMultiUserDisallowedByMaximumUsers) { + ASSERT_TRUE(RegisterUser(kTestUserId)); - EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, - SessionControllerClientImpl::GetAddUserSessionPolicy()); - AccountId account_id(AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); - while (user_manager()->GetLoggedInUsers().size() < - session_manager::kMaximumNumberOfUserSessions) { - account_id = AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444")); - user_manager()->AddUser(account_id); - user_manager()->LoginUser(account_id); + // Register "kMaximumNumberOfUserSessions" additional users. + // This is enough large to run the following check. + std::vector<AccountId> account_ids; + for (int i = 0; i < session_manager::kMaximumNumberOfUserSessions; ++i) { + const AccountId account_id = + AccountId::FromUserEmailGaiaId(base::StringPrintf("%d@gmail.com", i), + GaiaId(base::StringPrintf("%d", i))); + ASSERT_TRUE(RegisterUser(account_id)); + account_ids.push_back(account_id); } + + LogIn(kTestUserId); + auto* user_manager = user_manager::UserManager::Get(); + size_t index = 0; + while (user_manager->GetLoggedInUsers().size() < + session_manager::kMaximumNumberOfUserSessions) { + EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, + SessionControllerClientImpl::GetAddUserSessionPolicy()); + ASSERT_LT(index, account_ids.size()); + LogIn(account_ids[index++]); + } + + // Now hit the limit of the multi users. + EXPECT_EQ(user_manager->GetLoggedInUsers().size(), + size_t{session_manager::kMaximumNumberOfUserSessions}); EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED, SessionControllerClientImpl::GetAddUserSessionPolicy()); } -// Make sure adding users to multiprofiles disabled by logging in all possible -// users. -TEST_F(SessionControllerClientImplTest, - AddUserToMultiprofileDisallowedByAllUsersLogged) { - InitForMultiProfile(); - - EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, - SessionControllerClientImpl::GetAddUserSessionPolicy()); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); - UserAddedToSession( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); - EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, - SessionControllerClientImpl::GetAddUserSessionPolicy()); -} - // Make sure adding users to multiprofiles disabled by primary user policy. TEST_F(SessionControllerClientImplTest, - AddUserToMultiprofileDisallowedByPrimaryUserPolicy) { - TestingProfile* user_profile = InitForMultiProfile(); + AddUserToMultiUserDisallowedByPrimaryUserPolicy) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); + + TestingProfile* user_profile = LogIn(kTestUserId); EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, SessionControllerClientImpl::GetAddUserSessionPolicy()); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); + user_profile->GetPrefs()->SetString( user_manager::prefs::kMultiProfileUserBehaviorPref, user_manager::MultiUserSignInPolicyToPrefValue( user_manager::MultiUserSignInPolicy::kNotAllowed)); - user_manager()->AddUser( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, SessionControllerClientImpl::GetAddUserSessionPolicy()); } @@ -393,17 +412,13 @@ // Make sure adding users to multiprofiles disabled because device is locked // to single user. TEST_F(SessionControllerClientImplTest, - AddUserToMultiprofileDisallowedByLockToSingleUser) { - InitForMultiProfile(); + AddUserToMultiUserDisallowedByLockToSingleUser) { + ASSERT_TRUE(RegisterUser(kTestUserId)); + ASSERT_TRUE(RegisterUser(kOtherTestUserId)); - EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, - SessionControllerClientImpl::GetAddUserSessionPolicy()); - const AccountId account_id( - AccountId::FromUserEmailGaiaId(kUser, kUserGaiaId)); - user_manager()->LoginUser(account_id); + LogIn(kTestUserId); + session_termination_manager().SetDeviceLockedToSingleUser(); - user_manager()->AddUser( - AccountId::FromUserEmailGaiaId("bb@b.b", GaiaId("4444444444"))); EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_LOCKED_TO_SINGLE_USER, SessionControllerClientImpl::GetAddUserSessionPolicy()); } @@ -419,26 +434,16 @@ EXPECT_EQ(0, session_controller.update_user_session_count()); // Simulate login. - const AccountId account_id( - AccountId::FromUserEmailGaiaId("user@test.com", GaiaId("5555555555"))); - const user_manager::User* user = user_manager()->AddUser(account_id); - CreateTestingProfile(user); - session_manager().CreateSession( - account_id, - // TODO(crbug.com/278643115): Looks incorrect. - // User's username_hash should be set inside CreateSession via - // UserManager::UserLoggedIn(). - user->username_hash(), - /*new_user=*/false, - /*has_active_session=*/false); - session_manager().SetSessionState(SessionState::ACTIVE); + ASSERT_TRUE(RegisterUser(kTestUserId)); + LogIn(kTestUserId); // User session was sent. EXPECT_EQ(1, session_controller.update_user_session_count()); ASSERT_TRUE(session_controller.last_user_session()); // Simulate a request for an update where nothing changed. - client.SendUserSession(*user_manager()->GetLoggedInUsers()[0]); + client.SendUserSession( + *user_manager::UserManager::Get()->GetLoggedInUsers()[0]); // Session was not updated because nothing changed. EXPECT_EQ(1, session_controller.update_user_session_count()); @@ -454,19 +459,19 @@ // User session order is not sent. EXPECT_EQ(0, session_controller.set_user_session_order_count()); + ASSERT_TRUE(RegisterUser(kTestUserId)); + // Simulate a not-signed-in user has the user image changed. const AccountId not_signed_in(AccountId::FromUserEmailGaiaId( "not_signed_in@test.com", GaiaId("12345"))); - user_manager::User* not_signed_in_user = - user_manager()->AddUser(not_signed_in); - user_manager()->NotifyUserImageChanged(*not_signed_in_user); + user_manager::User* not_signed_in_user = RegisterUser(not_signed_in); + user_manager::UserManager::Get()->NotifyUserImageChanged(*not_signed_in_user); // User session order should not be sent. EXPECT_EQ(0, session_controller.set_user_session_order_count()); // Simulate login. - UserAddedToSession( - AccountId::FromUserEmailGaiaId("signed_in@test.com", GaiaId("67890"))); + LogIn(kTestUserId); // User session order is sent after the sign-in. EXPECT_EQ(1, session_controller.set_user_session_order_count()); @@ -480,24 +485,8 @@ client.Init(); // Simulate login. - const AccountId account_id( - AccountId::FromUserEmailGaiaId("user@test.com", GaiaId("5555555555"))); - const user_manager::User* user = user_manager()->AddUser(account_id); - session_manager().CreateSession( - account_id, - // TODO(crbug.com/278643115): Looks incorrect. - // User's username_hash should be set inside CreateSession via - // UserManager::UserLoggedIn(). - user->username_hash(), - /*new_user=*/false, - /*has_active_session=*/false); - - // Simulate the notification that the profile is ready. - TestingProfile* const user_profile = CreateTestingProfile(user); - session_manager().NotifyUserProfileLoaded(account_id); - - // User session could only be made active after user profile is loaded. - session_manager().SetSessionState(SessionState::ACTIVE); + ASSERT_TRUE(RegisterUser(kTestUserId)); + TestingProfile* user_profile = LogIn(kTestUserId); // Manipulate user prefs and verify SessionController is updated. PrefService* const user_prefs = user_profile->GetPrefs();
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_unittest.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_unittest.cc index 25898312..a1883b31 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_unittest.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_unittest.cc
@@ -8,6 +8,8 @@ #include <memory> #include "ash/frame/non_client_frame_view_ash.h" +#include "ash/public/cpp/test/test_new_window_delegate.h" +#include "ash/test/test_widget_builder.h" #include "ash/wm/window_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" @@ -53,6 +55,28 @@ event_generator.ClickLeftButton(); } +class TestNewWindowDelegate : public ash::TestNewWindowDelegate { + public: + TestNewWindowDelegate() = default; + TestNewWindowDelegate(const TestNewWindowDelegate&) = delete; + TestNewWindowDelegate& operator=(const TestNewWindowDelegate&) = delete; + ~TestNewWindowDelegate() override = default; + + void OpenUrl(const GURL& url, + OpenUrlFrom from, + Disposition disposition) override { + url_ = url; + // Window will be deleted by shell upon shutdown. + auto* widget = ash::TestWidgetBuilder().BuildOwnedByNativeWidget(); + ASSERT_TRUE(widget->IsActive()); + } + + std::optional<GURL> retrieve_url() { return std::move(url_); } + + private: + std::optional<GURL> url_; +}; + } // namespace namespace ash { @@ -79,6 +103,7 @@ // ChromeAshTestBase: void SetUp() override { + new_window_delegate_ = std::make_unique<::TestNewWindowDelegate>(); ChromeAshTestBase::SetUp(); profile_ = std::make_unique<TestingProfile>(); @@ -107,6 +132,8 @@ } ASSERT_FALSE(sharesheet_bubble_view_); ChromeAshTestBase::TearDown(); + + new_window_delegate_.reset(); } ::sharesheet::SharesheetService* GetSharesheetService() { @@ -114,9 +141,10 @@ profile_.get()); } - void ShowAndVerifyBubble(apps::IntentPtr intent, - ::sharesheet::LaunchSource source, - int num_actions_to_add = 0) { + void ShowAndVerifyBubble( + apps::IntentPtr intent, + ::sharesheet::LaunchSource source, + std::vector<::sharesheet::ShareActionType> actions = {}) { auto* sharesheet_service = GetSharesheetService(); sharesheet_service->ShowBubbleForTesting( parent_window_, std::move(intent), source, @@ -124,7 +152,7 @@ /*close_callback=*/ base::BindOnce(&SharesheetBubbleViewTest::OnClose, base::Unretained(this)), - num_actions_to_add); + actions); bubble_delegate_ = static_cast<SharesheetBubbleViewDelegate*>( sharesheet_service->GetUiDelegateForTesting(parent_window_)); EXPECT_NE(bubble_delegate_, nullptr); @@ -189,6 +217,7 @@ raw_ptr<SharesheetBubbleViewDelegate> bubble_delegate_; raw_ptr<SharesheetBubbleView> sharesheet_bubble_view_; raw_ptr<views::Widget> sharesheet_widget_; + std::unique_ptr<::TestNewWindowDelegate> new_window_delegate_; }; TEST_F(SharesheetBubbleViewTest, BubbleDoesOpenAndClose) { @@ -519,7 +548,7 @@ TEST_F(SharesheetBubbleViewTest, ShareActionShowsUpAsExpected) { ShowAndVerifyBubble(::sharesheet::CreateValidTextIntent(), ::sharesheet::LaunchSource::kUnknown, - /*num_actions_to_add=*/1); + {::sharesheet::kExample}); views::View* share_action_view = sharesheet_bubble_view()->GetViewByID( SharesheetViewID::SHARE_ACTION_VIEW_ID); ASSERT_FALSE(share_action_view->GetVisible()); @@ -538,6 +567,35 @@ ASSERT_FALSE(IsSharesheetVisible()); } +TEST_F(SharesheetBubbleViewTest, DriveActionShouldNotCrash) { + auto drive_intent = ::sharesheet::CreateDriveIntent(); + auto drive_share_url = drive_intent->drive_share_url.value(); + ShowAndVerifyBubble(std::move(drive_intent), + ::sharesheet::LaunchSource::kUnknown, + {::sharesheet::ShareActionType::kDriveShare}); + + views::View* share_action_view = sharesheet_bubble_view()->GetViewByID( + SharesheetViewID::SHARE_ACTION_VIEW_ID); + ASSERT_FALSE(share_action_view->GetVisible()); + + // |targets_view| should contain the share with others, copy, and drive share + // target. + views::View* targets_view = sharesheet_bubble_view()->GetViewByID( + SharesheetViewID::TARGETS_DEFAULT_VIEW_ID); + ASSERT_EQ(targets_view->children().size(), 3u); + + // The last one is drive share. + Click(targets_view->children()[2]); + EXPECT_FALSE(sharesheet_bubble_view()); + + // Make sure the drive action was invoked. + auto* delegate = static_cast<::TestNewWindowDelegate*>( + ash::NewWindowDelegate::GetPrimary()); + auto url = delegate->retrieve_url(); + ASSERT_TRUE(url.has_value()); + EXPECT_EQ(drive_share_url, *url); +} + TEST_F(SharesheetBubbleViewTest, ReshowHiddenBubble) { auto* sharesheet_service = GetSharesheetService(); auto app_window = CreateAppWindow();
diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser/ui/browser_window/internal/BUILD.gn index e651e04..ea1b9d1d 100644 --- a/chrome/browser/ui/browser_window/internal/BUILD.gn +++ b/chrome/browser/ui/browser_window/internal/BUILD.gn
@@ -29,6 +29,7 @@ "//chrome/browser/ui/extensions", "//chrome/browser/ui/find_bar:find_bar", "//chrome/browser/ui/lens", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/signin", "//chrome/browser/ui/tabs:tab_list_bridge", "//chrome/browser/ui/tabs/tab_strip_api",
diff --git a/chrome/browser/ui/browser_window/internal/browser_window_features.cc b/chrome/browser/ui/browser_window/internal/browser_window_features.cc index e10b82f40..ecfcb30 100644 --- a/chrome/browser/ui/browser_window/internal/browser_window_features.cc +++ b/chrome/browser/ui/browser_window/internal/browser_window_features.cc
@@ -57,6 +57,7 @@ #include "chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.h" #include "chrome/browser/ui/toolbar/pinned_toolbar/tab_search_toolbar_button_controller.h" #include "chrome/browser/ui/ui_features.h" +#include "chrome/browser/ui/views/color_provider_browser_helper.h" #include "chrome/browser/ui/views/download/bubble/download_toolbar_ui_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/tab_strip_region_view.h" @@ -321,6 +322,12 @@ incognito_clear_browsing_data_dialog_coordinator_ = std::make_unique<IncognitoClearBrowsingDataDialogCoordinator>(browser); + if (auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser)) { + color_provider_browser_helper_ = + std::make_unique<ColorProviderBrowserHelper>( + browser->GetTabStripModel(), browser_view->GetWidget()); + } + if (browser->is_type_normal() || browser->is_type_app()) { toast_service_ = std::make_unique<ToastService>(browser); } @@ -431,6 +438,8 @@ mv2_disabled_dialog_controller_->TearDown(); } + color_provider_browser_helper_.reset(); + if (shared_tab_group_feedback_controller_) { shared_tab_group_feedback_controller_->TearDown(); }
diff --git a/chrome/browser/ui/browser_window/public/browser_window_features.h b/chrome/browser/ui/browser_window/public/browser_window_features.h index 712a0d02..4bc3a12 100644 --- a/chrome/browser/ui/browser_window/public/browser_window_features.h +++ b/chrome/browser/ui/browser_window/public/browser_window_features.h
@@ -26,6 +26,7 @@ class BrowserView; class BrowserWindowInterface; class ChromeLabsCoordinator; +class ColorProviderBrowserHelper; class CookieControlsBubbleCoordinator; class DesktopBrowserWindowCapabilities; class DownloadToolbarUIController; @@ -436,6 +437,8 @@ std::unique_ptr<IncognitoClearBrowsingDataDialogCoordinator> incognito_clear_browsing_data_dialog_coordinator_; + std::unique_ptr<ColorProviderBrowserHelper> color_provider_browser_helper_; + // This is an experimental API that interacts with the TabStripModel. std::unique_ptr<TabStripServiceRegister> tab_strip_service_;
diff --git a/chrome/browser/ui/color/chrome_color_id.h b/chrome/browser/ui/color/chrome_color_id.h index 1b97a1d..5a5f1f8 100644 --- a/chrome/browser/ui/color/chrome_color_id.h +++ b/chrome/browser/ui/color/chrome_color_id.h
@@ -266,6 +266,7 @@ E_CPONLY(kColorNewTabPageComposeboxCancelButton) \ E_CPONLY(kColorNewTabPageComposeboxHover) \ E_CPONLY(kColorNewTabPageComposeboxSubmitButton) \ + E_CPONLY(kColorNewTabPageComposeboxUploadButton) \ E_CPONLY(kColorNewTabPageControlBackgroundHovered) \ E_CPONLY(kColorNewTabPageControlBackgroundSelected) \ E_CPONLY(kColorNewTabPageDialogBackground) \
diff --git a/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc b/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc index 785ce0c..c52c7af5 100644 --- a/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc +++ b/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc
@@ -53,6 +53,9 @@ : SkColorSetRGB(0xE9, 0xEB, 0xF0)}; mixer[kColorNewTabPageComposeboxSubmitButton] = { SkColorSetRGB(0x0B, 0x50, 0xD0)}; + mixer[kColorNewTabPageComposeboxUploadButton] = { + dark_mode ? SkColorSetRGB(0xE6, 0xE8, 0xF0) + : SkColorSetRGB(0x0A, 0x0A, 0x0A)}; mixer[kColorNewTabPageControlBackgroundHovered] = { ui::kColorSysStateHoverOnSubtle};
diff --git a/chrome/browser/ui/color/new_tab_page_color_mixer.cc b/chrome/browser/ui/color/new_tab_page_color_mixer.cc index 4d6b46b..ef6bc94f 100644 --- a/chrome/browser/ui/color/new_tab_page_color_mixer.cc +++ b/chrome/browser/ui/color/new_tab_page_color_mixer.cc
@@ -327,6 +327,9 @@ : SkColorSetRGB(0xE9, 0xEB, 0xF0)}; mixer[kColorNewTabPageComposeboxSubmitButton] = { SkColorSetRGB(0x0B, 0x50, 0xD0)}; + mixer[kColorNewTabPageComposeboxUploadButton] = { + dark_mode ? SkColorSetRGB(0xE6, 0xE8, 0xF0) + : SkColorSetRGB(0x0A, 0x0A, 0x0A)}; mixer[kColorNewTabPageMostVisitedTileBackgroundUnthemed] = { gfx::kGoogleGrey100};
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/extensions/extension_uninstall_dialog_impl.cc similarity index 76% rename from chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc rename to chrome/browser/ui/extensions/extension_uninstall_dialog_impl.cc index 85b6890..8b358ba 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/extensions/extension_uninstall_dialog_impl.cc
@@ -10,31 +10,28 @@ #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/ui/extensions/extension_dialog_utils.h" -#include "chrome/browser/ui/views/extensions/extensions_toolbar_container.h" #include "chrome/grit/generated_resources.h" #include "ui/base/interaction/element_identifier.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/dialog_model.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/views/controls/button/checkbox.h" -#include "ui/views/view.h" namespace { DEFINE_LOCAL_ELEMENT_IDENTIFIER_VALUE(kCheckboxId); -// Views implementation of the uninstall dialog. -class ExtensionUninstallDialogViews +// The implementation of the uninstall dialog. +class ExtensionUninstallDialogImpl : public extensions::ExtensionUninstallDialog { public: - ExtensionUninstallDialogViews( + ExtensionUninstallDialogImpl( Profile* profile, gfx::NativeWindow parent, extensions::ExtensionUninstallDialog::Delegate* delegate); - ExtensionUninstallDialogViews(const ExtensionUninstallDialogViews&) = delete; - ExtensionUninstallDialogViews& operator=( - const ExtensionUninstallDialogViews&) = delete; - ~ExtensionUninstallDialogViews() override; + ExtensionUninstallDialogImpl(const ExtensionUninstallDialogImpl&) = delete; + ExtensionUninstallDialogImpl& operator=(const ExtensionUninstallDialogImpl&) = + delete; + ~ExtensionUninstallDialogImpl() override; // Forwards that the dialog has been accepted to the delegate. void DialogAccepted(); @@ -53,24 +50,23 @@ // WeakPtrs because the associated dialog may outlive |this|, which is owned // by the caller of extensions::ExtensionsUninstallDialog::Create(). - base::WeakPtrFactory<ExtensionUninstallDialogViews> weak_ptr_factory_{this}; + base::WeakPtrFactory<ExtensionUninstallDialogImpl> weak_ptr_factory_{this}; }; -ExtensionUninstallDialogViews::ExtensionUninstallDialogViews( +ExtensionUninstallDialogImpl::ExtensionUninstallDialogImpl( Profile* profile, gfx::NativeWindow parent, extensions::ExtensionUninstallDialog::Delegate* delegate) : extensions::ExtensionUninstallDialog(profile, parent, delegate) {} -ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() { +ExtensionUninstallDialogImpl::~ExtensionUninstallDialogImpl() { if (dialog_model_) { dialog_model_->host()->Close(); } DCHECK(!dialog_model_); } -void ExtensionUninstallDialogViews::Show() { - // TODO(pbos): Consider separating dialog model from views code. +void ExtensionUninstallDialogImpl::Show() { ui::DialogModel::Builder dialog_builder; dialog_builder.SetInternalName("ExtensionUninstallDialog") .SetTitle(l10n_util::GetStringFUTF16( @@ -79,20 +75,19 @@ extension()->name()))) .OverrideShowCloseButton(false) .SetDialogDestroyingCallback( - base::BindOnce(&ExtensionUninstallDialogViews::DialogClosing, + base::BindOnce(&ExtensionUninstallDialogImpl::DialogClosing, weak_ptr_factory_.GetWeakPtr())) .SetIcon(ui::ImageModel::FromImageSkia( gfx::ImageSkiaOperations::CreateResizedImage( icon(), skia::ImageOperations::ResizeMethod::RESIZE_GOOD, gfx::Size(extension_misc::EXTENSION_ICON_SMALL, extension_misc::EXTENSION_ICON_SMALL)))) - .AddOkButton( - base::BindOnce(&ExtensionUninstallDialogViews::DialogAccepted, - weak_ptr_factory_.GetWeakPtr()), - ui::DialogModel::Button::Params() - .SetLabel(l10n_util::GetStringUTF16( - IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON)) - .SetId(kOkButtonElementId)) + .AddOkButton(base::BindOnce(&ExtensionUninstallDialogImpl::DialogAccepted, + weak_ptr_factory_.GetWeakPtr()), + ui::DialogModel::Button::Params() + .SetLabel(l10n_util::GetStringUTF16( + IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON)) + .SetId(kOkButtonElementId)) .AddCancelButton( base::DoNothing() /* Cancel is covered by WindowClosingCallback */, ui::DialogModel::Button::Params().SetId(kCancelButtonElementId)); @@ -128,12 +123,12 @@ ShowDialog(parent(), extension()->id(), std::move(dialog_model)); } -void ExtensionUninstallDialogViews::Close() { +void ExtensionUninstallDialogImpl::Close() { DCHECK(dialog_model_); dialog_model_->host()->Close(); } -void ExtensionUninstallDialogViews::DialogAccepted() { +void ExtensionUninstallDialogImpl::DialogAccepted() { DCHECK(dialog_model_); const bool checkbox_is_checked = ShouldShowCheckbox() && @@ -144,7 +139,7 @@ : CLOSE_ACTION_UNINSTALL); } -void ExtensionUninstallDialogViews::DialogClosing() { +void ExtensionUninstallDialogImpl::DialogClosing() { if (!dialog_model_) { return; } @@ -164,6 +159,6 @@ extensions::ExtensionUninstallDialog::Create(Profile* profile, gfx::NativeWindow parent, Delegate* delegate) { - return std::make_unique<ExtensionUninstallDialogViews>(profile, parent, - delegate); + return std::make_unique<ExtensionUninstallDialogImpl>(profile, parent, + delegate); }
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc b/chrome/browser/ui/extensions/extension_uninstall_dialog_impl_browsertest.cc similarity index 95% rename from chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc rename to chrome/browser/ui/extensions/extension_uninstall_dialog_impl_browsertest.cc index 80c4d1c..01f18e9 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc +++ b/chrome/browser/ui/extensions/extension_uninstall_dialog_impl_browsertest.cc
@@ -111,12 +111,12 @@ } // namespace -using ExtensionUninstallDialogViewBrowserTest = InProcessBrowserTest; +using ExtensionUninstallDialogImplBrowserTest = InProcessBrowserTest; // Test that ExtensionUninstallDialog cancels the uninstall if the Window which // is passed to ExtensionUninstallDialog::Create() is destroyed before // ExtensionUninstallDialogDelegateView is created. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, TrackParentWindowDestruction) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -141,7 +141,7 @@ // Test that ExtensionUninstallDialog cancels the uninstall if the Window which // is passed to ExtensionUninstallDialog::Create() is destroyed after // ExtensionUninstallDialogDelegateView is created. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, TrackParentWindowDestructionAfterViewCreation) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -169,7 +169,7 @@ // Tests uninstalling the extension while the dialog is active. // Regression test for https://1200679. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, ExtensionUninstalledWhileDialogIsActive) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -207,7 +207,7 @@ // Test that we don't crash when uninstalling an extension from a web app // window in Ash. Context: crbug.com/825554 // TODO(crbug.com/415937950): Fix and re-enable flaky test. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, DISABLED_WebAppWindowAshCrash) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -255,14 +255,14 @@ } } -class ParameterizedExtensionUninstallDialogViewBrowserTest +class ParameterizedExtensionUninstallDialogImplBrowserTest : public InProcessBrowserTest, public testing::WithParamInterface<extensions::UninstallReason> {}; // Test that when the user clicks Uninstall on the ExtensionUninstallDialog the // extension's uninstall url (when it is specified) should open and be the // active tab. -IN_PROC_BROWSER_TEST_P(ParameterizedExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_P(ParameterizedExtensionUninstallDialogImplBrowserTest, EnsureExtensionUninstallURLIsActiveTabAfterUninstall) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -309,7 +309,7 @@ // on the ExtensionUninstallDialog, the extension's uninstall url (when it is // specified) and the CWS Report Abuse survey are opened in the browser, also // testing that the CWS survey is the active tab. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, EnsureCWSReportAbusePageIsActiveTabAfterUninstall) { scoped_refptr<const extensions::Extension> extension(BuildTestExtension()); extensions::ExtensionRegistrar::Get(browser()->profile()) @@ -368,7 +368,7 @@ // Tests the dialog is anchored in the correct place based on whether the // extensions container is visible. // Regression test for crbug.com/133249. -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplBrowserTest, DialogAnchoredInCorrectPlace) { extensions::ExtensionRegistrar* extension_registrar = extensions::ExtensionRegistrar::Get(browser()->profile()); @@ -472,7 +472,7 @@ } } -class ExtensionUninstallDialogViewInteractiveBrowserTest +class ExtensionUninstallDialogImplInteractiveBrowserTest : public DialogBrowserTest { public: enum UninstallMethod { @@ -551,7 +551,7 @@ #else #define MAYBE_InvokeUi_ManualUninstall InvokeUi_ManualUninstall #endif -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewInteractiveBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplInteractiveBrowserTest, MAYBE_InvokeUi_ManualUninstall) { RunTest(MANUAL_UNINSTALL, EXTENSION_LOCAL_SOURCE); } @@ -564,7 +564,7 @@ #define MAYBE_InvokeUi_ManualUninstallShowReportAbuse \ InvokeUi_ManualUninstallShowReportAbuse #endif -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewInteractiveBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplInteractiveBrowserTest, MAYBE_InvokeUi_ManualUninstallShowReportAbuse) { RunTest(MANUAL_UNINSTALL, EXTENSION_FROM_WEBSTORE); } @@ -576,7 +576,7 @@ #else #define MAYBE_InvokeUi_UninstallByExtension InvokeUi_UninstallByExtension #endif -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewInteractiveBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplInteractiveBrowserTest, MAYBE_InvokeUi_UninstallByExtension) { RunTest(UNINSTALL_BY_EXTENSION, EXTENSION_LOCAL_SOURCE); } @@ -589,13 +589,13 @@ #define MAYBE_InvokeUi_UninstallByExtensionShowReportAbuse \ InvokeUi_UninstallByExtensionShowReportAbuse #endif -IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewInteractiveBrowserTest, +IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogImplInteractiveBrowserTest, MAYBE_InvokeUi_UninstallByExtensionShowReportAbuse) { RunTest(UNINSTALL_BY_EXTENSION, EXTENSION_FROM_WEBSTORE); } INSTANTIATE_TEST_SUITE_P( All, - ParameterizedExtensionUninstallDialogViewBrowserTest, + ParameterizedExtensionUninstallDialogImplBrowserTest, testing::Values(extensions::UNINSTALL_REASON_USER_INITIATED, extensions::UNINSTALL_REASON_CHROME_WEBSTORE));
diff --git a/chrome/browser/ui/feature_first_run/autofill_ai_first_run_dialog.cc b/chrome/browser/ui/feature_first_run/autofill_ai_first_run_dialog.cc index db08e53..8199cde 100644 --- a/chrome/browser/ui/feature_first_run/autofill_ai_first_run_dialog.cc +++ b/chrome/browser/ui/feature_first_run/autofill_ai_first_run_dialog.cc
@@ -12,6 +12,7 @@ #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/controls/rich_controls_container_view.h" #include "chrome/common/webui_url_constants.h" +#include "chrome/grit/browser_resources.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" #include "components/autofill/content/browser/content_autofill_client.h" @@ -21,6 +22,8 @@ #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/image_model.h" +#include "ui/base/resource/resource_bundle.h" namespace feature_first_run { @@ -77,10 +80,12 @@ void ShowAutofillAiFirstRunDialog(content::WebContents* web_contents) { autofill::LogOptInFunnelEvent( autofill::AutofillAiOptInFunnelEvents::kFFRDialogShown); + + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); ShowFeatureFirstRunDialog( l10n_util::GetStringUTF16(IDS_AUTOFILL_AI_OPT_IN_IPH_TITLE), - ui::ImageModel::FromResourceId(IDR_AUTOFILL_AI_FFR_BANNER), - ui::ImageModel::FromResourceId(IDR_AUTOFILL_AI_FFR_BANNER_DARK), + bundle.GetThemedLottieImageNamed(IDR_AUTOFILL_AI_FFR_BANNER_LOTTIE), + /*dark_mode_banner=*/ui::ImageModel(), CreateDialogContentView(web_contents), base::BindOnce(&OnDialogAccepted, web_contents), base::BindOnce(&OnDialogCancelled), web_contents);
diff --git a/chrome/browser/ui/hats/BUILD.gn b/chrome/browser/ui/hats/BUILD.gn index b11d94e..0a241ea 100644 --- a/chrome/browser/ui/hats/BUILD.gn +++ b/chrome/browser/ui/hats/BUILD.gn
@@ -44,6 +44,7 @@ "hats_service_factory.cc", "survey_config.cc", ] + deps = [] if (!is_android) { sources += [ @@ -52,8 +53,10 @@ "trust_safety_sentiment_service.cc", "trust_safety_sentiment_service_factory.cc", ] + + deps += [ "//chrome/browser/ui/performance_controls" ] } - deps = [ + deps += [ ":hats", "//chrome/browser:browser_process", "//chrome/browser/content_settings:content_settings_factory",
diff --git a/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc b/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc index 74b24f6..8ea8da6 100644 --- a/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc +++ b/chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc
@@ -5340,6 +5340,7 @@ std::vector<base::test::FeatureRef> GetDisabledFeatures() const override { auto disabled = PDFExtensionTestBase::GetDisabledFeatures(); disabled.emplace_back(lens::features::kLensOverlayContextualSearchbox); + disabled.emplace_back(lens::features::kLensOverlayKeyboardSelection); return disabled; }
diff --git a/chrome/browser/ui/performance_controls/BUILD.gn b/chrome/browser/ui/performance_controls/BUILD.gn new file mode 100644 index 0000000..7ea6c7f --- /dev/null +++ b/chrome/browser/ui/performance_controls/BUILD.gn
@@ -0,0 +1,50 @@ +# Copyright 2025 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +if (!is_android) { + source_set("performance_controls") { + sources = [ + "battery_saver_bubble_delegate.h", + "battery_saver_bubble_observer.h", + "battery_saver_button_controller.h", + "battery_saver_button_controller_delegate.h", + "memory_saver_bubble_controller.h", + "memory_saver_bubble_delegate.h", + "memory_saver_bubble_observer.h", + "memory_saver_chip_controller.h", + "memory_saver_chip_tab_helper.h", + "memory_saver_opt_in_iph_controller.h", + "memory_saver_utils.h", + "performance_controls_hats_service.h", + "performance_controls_hats_service_factory.h", + "performance_controls_metrics.h", + "performance_intervention_bubble_delegate.h", + "performance_intervention_bubble_observer.h", + "performance_intervention_button_controller.h", + "performance_intervention_button_controller_delegate.h", + "tab_list_model.h", + "tab_resource_usage_collector.h", + "tab_resource_usage_tab_helper.h", + ] + public_deps = [ + "//base", + "//chrome/browser/performance_manager/public/user_tuning", + "//chrome/browser/profiles:profile", + "//chrome/browser/resource_coordinator", + "//chrome/browser/resource_coordinator:mojo_bindings_shared", + "//chrome/browser/resource_coordinator:mojo_bindings_shared_cpp_sources", + "//chrome/browser/ui/hats", + "//chrome/browser/ui/tabs", + "//chrome/browser/ui/tabs:tab_strip_model_observer", + "//components/keyed_service/core", + "//components/metrics", + "//components/performance_manager", + "//components/prefs", + "//components/tabs:public", + "//content/public/browser", + "//ui/base", + "//url", + ] + } +}
diff --git a/chrome/browser/ui/performance_controls/memory_saver_bubble_delegate.h b/chrome/browser/ui/performance_controls/memory_saver_bubble_delegate.h index 8588ffe..fe00c28c 100644 --- a/chrome/browser/ui/performance_controls/memory_saver_bubble_delegate.h +++ b/chrome/browser/ui/performance_controls/memory_saver_bubble_delegate.h
@@ -6,11 +6,12 @@ #define CHROME_BROWSER_UI_PERFORMANCE_CONTROLS_MEMORY_SAVER_BUBBLE_DELEGATE_H_ #include "base/memory/raw_ptr.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/performance_controls/memory_saver_bubble_observer.h" #include "chrome/browser/ui/performance_controls/performance_controls_metrics.h" #include "ui/base/models/dialog_model.h" +class Browser; + // This class is the delegate for the memory saver bubble dialog that handles // the events raised from the dialog. class MemorySaverBubbleDelegate : public ui::DialogModelDelegate {
diff --git a/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/BUILD.gn b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/BUILD.gn new file mode 100644 index 0000000..07046dc --- /dev/null +++ b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/BUILD.gn
@@ -0,0 +1,18 @@ +# Copyright 2025 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +assert(is_win) + +source_set("pin_infobar") { + sources = [ + "pin_infobar_controller.cc", + "pin_infobar_controller.h", + ] + deps = [ + "//base", + "//chrome/browser:shell_integration", + "//chrome/browser/ui/browser_window", + "//components/infobars/core", + ] +}
diff --git a/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/OWNERS b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/OWNERS new file mode 100644 index 0000000..8d80cee --- /dev/null +++ b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/OWNERS
@@ -0,0 +1,2 @@ +davidbienvenu@chromium.org +jessemckenna@google.com
diff --git a/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.cc b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.cc new file mode 100644 index 0000000..e9a5e86 --- /dev/null +++ b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.cc
@@ -0,0 +1,56 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.h" + +#include "base/functional/callback.h" +#include "base/memory/weak_ptr.h" +#include "base/notimplemented.h" +#include "chrome/browser/shell_integration.h" +#include "chrome/browser/ui/browser_window/public/browser_window_interface.h" +#include "components/infobars/core/infobar.h" + +namespace default_browser { + +PinInfoBarController::PinInfoBarController(BrowserWindowInterface* browser) { + NOTIMPLEMENTED(); +} + +PinInfoBarController::~PinInfoBarController() = default; + +void PinInfoBarController::OnBrowserClosed(BrowserWindowInterface* browser) { + NOTIMPLEMENTED(); +} + +void PinInfoBarController::OnInfoBarRemoved(infobars::InfoBar* infobar, + bool animate) { + NOTIMPLEMENTED(); +} + +// static +void PinInfoBarController::MaybeShowInfoBarForBrowser( + base::WeakPtr<BrowserWindowInterface> browser, + base::OnceCallback<void(bool)> done_callback, + bool another_infobar_shown) { + NOTIMPLEMENTED(); +} + +void PinInfoBarController::MaybeShowInfoBar( + base::OnceCallback<void(bool)> done_callback) { + NOTIMPLEMENTED(); +} + +void PinInfoBarController::OnIsDefaultBrowserResult( + base::OnceCallback<void(bool)> done_callback, + shell_integration::DefaultWebClientState default_state) { + NOTIMPLEMENTED(); +} + +void PinInfoBarController::OnShouldOfferToPinResult( + base::OnceCallback<void(bool)> done_callback, + bool should_offer_to_pin) { + NOTIMPLEMENTED(); +} + +} // namespace default_browser
diff --git a/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.h b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.h new file mode 100644 index 0000000..e2e7d0d --- /dev/null +++ b/chrome/browser/ui/startup/default_browser_prompt/pin_infobar/pin_infobar_controller.h
@@ -0,0 +1,61 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PIN_INFOBAR_PIN_INFOBAR_CONTROLLER_H_ +#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PIN_INFOBAR_PIN_INFOBAR_CONTROLLER_H_ + +#include "base/functional/callback.h" +#include "base/memory/weak_ptr.h" +#include "chrome/browser/shell_integration.h" +#include "components/infobars/core/infobar_manager.h" + +class BrowserWindowInterface; + +namespace infobars { +class InfoBar; +} // namespace infobars + +namespace default_browser { + +// Toggles the pin-to-taskbar infobar if Chrome is the default browser but is +// not pinned to the taskbar. This infobar offers to pin Chrome to the taskbar. +class PinInfoBarController : public infobars::InfoBarManager::Observer { + public: + explicit PinInfoBarController(BrowserWindowInterface* browser); + ~PinInfoBarController() override; + + // Callback passed to `BrowserWindowInterface::RegisterBrowserDidClose()`. + void OnBrowserClosed(BrowserWindowInterface* browser); + + // InfoBarManager::Observer: + void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override; + + // Shows the pin-to-taskbar infobar on `browser` if `another_infobar_shown` is + // false and it's appropriate to do so (see `MaybeShowInfoBar()` for + // conditions). When done, passes `done_callback` a boolean indicating whether + // the infobar was shown. + static void MaybeShowInfoBarForBrowser( + base::WeakPtr<BrowserWindowInterface> browser, + base::OnceCallback<void(bool)> done_callback, + bool another_infobar_shown); + + void OnIsDefaultBrowserResult( + base::OnceCallback<void(bool)> done_callback, + shell_integration::DefaultWebClientState default_state); + + void OnShouldOfferToPinResult(base::OnceCallback<void(bool)> done_callback, + bool should_offer_to_pin); + + private: + // Asynchronously checks the following in sequence: + // * that Chrome is the default browser + // * that Chrome can be pinned to the taskbar + // If the above are true, the infobar is shown. Passes `done_callback` a + // boolean indicating whether the infobar was shown. + void MaybeShowInfoBar(base::OnceCallback<void(bool)> done_callback); +}; + +} // namespace default_browser + +#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PIN_INFOBAR_PIN_INFOBAR_CONTROLLER_H_
diff --git a/chrome/browser/ui/tabs/BUILD.gn b/chrome/browser/ui/tabs/BUILD.gn index 1e8bbf4..8302ad4 100644 --- a/chrome/browser/ui/tabs/BUILD.gn +++ b/chrome/browser/ui/tabs/BUILD.gn
@@ -397,6 +397,7 @@ "//chrome/browser/ui/browser_window:browser_window", "//chrome/browser/ui/commerce", "//chrome/browser/ui/lens", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/tabs/alert:tab_alert", "//chrome/browser/ui/toolbar", "//chrome/browser/ui/toolbar/pinned_toolbar", @@ -620,6 +621,7 @@ "//chrome/browser/ui", "//chrome/browser/ui:browser_list", "//chrome/browser/ui:ui_features", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/startup:startup_tab", "//chrome/browser/ui/tab_contents", "//chrome/common:non_code_constants",
diff --git a/chrome/browser/ui/unowned_user_data/unowned_user_data_unittest.cc b/chrome/browser/ui/unowned_user_data/unowned_user_data_unittest.cc index db863f73..5091705 100644 --- a/chrome/browser/ui/unowned_user_data/unowned_user_data_unittest.cc +++ b/chrome/browser/ui/unowned_user_data/unowned_user_data_unittest.cc
@@ -50,7 +50,15 @@ // Tests basic functionality of a class inheriting from // UnownedUserDataInterface. -TEST(UnownedUserDataTest, UnownedUserDataInterface) { +// TODO(crbug.com/428749341): Re-enable this test for some specific Linux +// builders where it fails consistently. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_UnownedUserDataInterface DISABLED_UnownedUserDataInterface +#else +#define MAYBE_UnownedUserDataInterface UnownedUserDataInterface +#endif // BUILDFLAG(IS_LINUX) + +TEST(UnownedUserDataTest, MAYBE_UnownedUserDataInterface) { UnownedUserDataHost host; EXPECT_EQ(nullptr, TestUnownedUserDataSubclass::Get(host)); { @@ -62,7 +70,14 @@ // Tests that different types of UnownedUserData are independent of one another // and can be individually set and unset. -TEST(UnownedUserDataTest, DifferentTypesAreIndependent) { +// TODO(crbug.com/428749341): Re-enable this test for some specific Linux +// builders where it fails consistently. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_DifferentTypesAreIndependent DISABLED_DifferentTypesAreIndependent +#else +#define MAYBE_DifferentTypesAreIndependent DifferentTypesAreIndependent +#endif // BUILDFLAG(IS_LINUX) +TEST(UnownedUserDataTest, MAYBE_DifferentTypesAreIndependent) { // We use the two types of TestUnownedUserDataSubclass and // TestScopedUnownedUserData. These could be thought of as "UnownedUserData1" // and "UnownedUserData2".
diff --git a/chrome/browser/ui/unowned_user_data/user_data_factory_unittest.cc b/chrome/browser/ui/unowned_user_data/user_data_factory_unittest.cc index 7d119d5..b96b512 100644 --- a/chrome/browser/ui/unowned_user_data/user_data_factory_unittest.cc +++ b/chrome/browser/ui/unowned_user_data/user_data_factory_unittest.cc
@@ -140,7 +140,15 @@ } // namespace -TEST(UserDataFactoryTest, CreatesDefaults) { +// TODO(crbug.com/428749341): Re-enable this test for some specific Linux +// builders where it fails consistently. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_UserDataFactoryTest DISABLED_UserDataFactoryTest +#else +#define MAYBE_UserDataFactoryTest UserDataFactoryTest +#endif // BUILDFLAG(IS_LINUX) + +TEST(MAYBE_UserDataFactoryTest, CreatesDefaults) { TestFeatures features; auto* const data1 = ScopedUserData1::From(features); auto* const data2 = ScopedUserData2::From(features); @@ -151,7 +159,7 @@ EXPECT_EQ(TestFeatures::kConcat, data2->value()); } -TEST(UserDataFactoryTest, OverrideFirst) { +TEST(MAYBE_UserDataFactoryTest, OverrideFirst) { auto override = TestFeatures::GetDataFactory().AddOverrideForTesting( base::BindRepeating([](TestFeatures& host) { return std::make_unique<TestScopedUserData1>(host.unowned_data_host()); @@ -170,7 +178,7 @@ ScopedUserData1::Get(features2.unowned_data_host())->value()); } -TEST(UserDataFactoryTest, ScopedOverrideGoesOutOfScope) { +TEST(MAYBE_UserDataFactoryTest, ScopedOverrideGoesOutOfScope) { { auto override = TestFeatures::GetDataFactory().AddOverrideForTesting( base::BindRepeating([](TestFeatures& host) { @@ -193,7 +201,7 @@ ScopedUserData1::Get(features2.unowned_data_host())->value()); } -TEST(UserDataFactoryTest, ScopedOverrideCopyAndReset) { +TEST(MAYBE_UserDataFactoryTest, ScopedOverrideCopyAndReset) { UserDataFactory::ScopedOverride override; override = TestFeatures::GetDataFactory().AddOverrideForTesting( @@ -217,7 +225,7 @@ ScopedUserData1::Get(features2.unowned_data_host())->value()); } -TEST(UserDataFactoryTest, OverrideSecond) { +TEST(MAYBE_UserDataFactoryTest, OverrideSecond) { auto override = TestFeatures::GetDataFactory().AddOverrideForTesting( base::BindRepeating([](TestFeatures& host) { // Use the value from another object already in `host` to calculate @@ -245,7 +253,7 @@ ScopedUserData2::Get(features2.unowned_data_host())->value()); } -TEST(UserDataFactoryTest, OverrideBoth) { +TEST(MAYBE_UserDataFactoryTest, OverrideBoth) { auto override = TestFeatures::GetDataFactory().AddOverrideForTesting( base::BindRepeating([](TestFeatures& host) { return std::make_unique<TestScopedUserData1>(host.unowned_data_host());
diff --git a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc index 1208ebde..d68ac53 100644 --- a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc
@@ -7,11 +7,11 @@ #include <memory> #include "chrome/browser/ui/browser_dialogs.h" -#include "chrome/browser/ui/views/accessibility/theme_tracking_non_accessible_image_view.h" #include "chrome/browser/ui/views/autofill/payments/dialog_view_ids.h" #include "chrome/browser/ui/views/autofill/payments/payments_view_util.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/chrome_typography.h" +#include "chrome/grit/browser_resources.h" #include "components/autofill/core/browser/data_model/payments/credit_card.h" #include "components/autofill/core/browser/metrics/payments/virtual_card_enrollment_metrics.h" #include "components/autofill/core/browser/payments/legal_message_line.h" @@ -27,6 +27,7 @@ #include "ui/views/accessibility/view_accessibility.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/bubble/tooltip_icon.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/styled_label.h" #include "ui/views/controls/throbber.h" @@ -109,13 +110,10 @@ .set_bottom(0)); ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); - auto image_view = std::make_unique<ThemeTrackingNonAccessibleImageView>( - *bundle.GetImageSkiaNamed(IDR_AUTOFILL_VIRTUAL_CARD_ENROLL_DIALOG), - *bundle.GetImageSkiaNamed(IDR_AUTOFILL_VIRTUAL_CARD_ENROLL_DIALOG_DARK), - base::BindRepeating(&views::BubbleDialogDelegate::background_color, - base::Unretained(this))); - - header_view->AddChildView(std::move(image_view)); + auto image = std::make_unique<views::ImageView>( + bundle.GetThemedLottieImageNamed(IDR_VIRTUAL_CARD_ENROLL_DIALOG_LOTTIE)); + image->GetViewAccessibility().SetIsInvisible(true); + header_view->AddChildView(std::move(image)); GetBubbleFrameView()->SetHeaderView(std::move(header_view)); GetBubbleFrameView()->SetTitleView(
diff --git a/chrome/browser/ui/views/color_provider_browser_helper.cc b/chrome/browser/ui/views/color_provider_browser_helper.cc index 3669c804..675bf32 100644 --- a/chrome/browser/ui/views/color_provider_browser_helper.cc +++ b/chrome/browser/ui/views/color_provider_browser_helper.cc
@@ -4,11 +4,10 @@ #include "chrome/browser/ui/views/color_provider_browser_helper.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -#include "chrome/browser/ui/views/frame/browser_view.h" #include "content/public/browser/web_contents.h" +#include "ui/color/color_provider_source.h" void ColorProviderBrowserHelper::OnTabStripModelChanged( TabStripModel* tab_strip_model, @@ -18,19 +17,22 @@ return; } for (const auto& contents : change.GetInsert()->contents) { - DCHECK(tab_strip_model->ContainsIndex(contents.index)); - contents.contents->SetColorProviderSource( - BrowserView::GetBrowserViewForBrowser(&GetBrowser())->GetWidget()); + CHECK(tab_strip_model->ContainsIndex(contents.index)); + contents.contents->SetColorProviderSource(color_provider_source_); } } -ColorProviderBrowserHelper::ColorProviderBrowserHelper(Browser* browser) - : BrowserUserData<ColorProviderBrowserHelper>(*browser) { - TabStripModel* tab_strip_model = browser->tab_strip_model(); +ColorProviderBrowserHelper::ColorProviderBrowserHelper( + TabStripModel* tab_strip_model, + ui::ColorProviderSource* color_provider_source) + : tab_strip_model_(tab_strip_model), + color_provider_source_(color_provider_source) { + CHECK(tab_strip_model); + CHECK(color_provider_source); // No WebContents should have been added to the TabStripModel before // ColorProviderBrowserHelper is constructed. - DCHECK(tab_strip_model->empty()); + CHECK(tab_strip_model->empty()); tab_strip_model->AddObserver(this); } -BROWSER_USER_DATA_KEY_IMPL(ColorProviderBrowserHelper); +ColorProviderBrowserHelper::~ColorProviderBrowserHelper() = default;
diff --git a/chrome/browser/ui/views/color_provider_browser_helper.h b/chrome/browser/ui/views/color_provider_browser_helper.h index f364249..9856fa40 100644 --- a/chrome/browser/ui/views/color_provider_browser_helper.h +++ b/chrome/browser/ui/views/color_provider_browser_helper.h
@@ -5,22 +5,27 @@ #ifndef CHROME_BROWSER_UI_VIEWS_COLOR_PROVIDER_BROWSER_HELPER_H_ #define CHROME_BROWSER_UI_VIEWS_COLOR_PROVIDER_BROWSER_HELPER_H_ -#include "chrome/browser/ui/browser_user_data.h" +#include "base/memory/raw_ptr.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -class Browser; +namespace ui { +class ColorProviderSource; +} // namespace ui + class TabStripModel; // A TabStripModelObserver that ensures the WebContents in the TabStripModel // observe the correct ColorProviderSource. -class ColorProviderBrowserHelper - : public BrowserUserData<ColorProviderBrowserHelper>, - public TabStripModelObserver { +class ColorProviderBrowserHelper : public TabStripModelObserver { public: + ColorProviderBrowserHelper(TabStripModel* tab_strip_model, + ui::ColorProviderSource* color_provider_source); ColorProviderBrowserHelper(const ColorProviderBrowserHelper&) = delete; ColorProviderBrowserHelper& operator=(const ColorProviderBrowserHelper&) = delete; + ~ColorProviderBrowserHelper() override; + // TabStripModelObserver void OnTabStripModelChanged( TabStripModel* tab_strip_model, @@ -28,11 +33,8 @@ const TabStripSelectionChange& selection) override; private: - friend class BrowserUserData<ColorProviderBrowserHelper>; - - explicit ColorProviderBrowserHelper(Browser* browser); - - BROWSER_USER_DATA_KEY_DECL(); + const raw_ptr<TabStripModel> tab_strip_model_; + const raw_ptr<ui::ColorProviderSource> color_provider_source_; }; #endif // CHROME_BROWSER_UI_VIEWS_COLOR_PROVIDER_BROWSER_HELPER_H_
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 5fe92ad..3c53a86 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1007,8 +1007,6 @@ tab_strip_region_view_ = top_container_->AddChildView( std::make_unique<TabStripRegionView>(std::move(tabstrip))); - ColorProviderBrowserHelper::CreateForBrowser(browser_.get()); - // Create WebViews early so |webui_tab_strip_| can observe their size. auto devtools_web_view = std::make_unique<views::WebView>(browser_->profile());
diff --git a/chrome/browser/ui/views/media_picker_utils.cc b/chrome/browser/ui/views/media_picker_utils.cc index 83c05e80..fa6ead6 100644 --- a/chrome/browser/ui/views/media_picker_utils.cc +++ b/chrome/browser/ui/views/media_picker_utils.cc
@@ -41,7 +41,15 @@ // Top-level windows should usually be draggable. if (!parent) { delegate->set_draggable(true); +#if BUILDFLAG(IS_CHROMEOS) + // kSystem is available only on CrOS and should be used here because the + // dimmer window is shown in front of the media picker dialog when the + // dialog is requested by an Android app. kSystem brings the dialog in + // front of the dimmer. + delegate->SetModalType(ui::mojom::ModalType::kSystem); +#else delegate->SetModalType(ui::mojom::ModalType::kNone); +#endif } widget = views::DialogDelegate::CreateDialogWidget(delegate, context, parent);
diff --git a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc index a7c22aa..6d2c269 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
@@ -239,7 +239,7 @@ layout_style_ = LayoutStyle::SEARCH_SUGGESTION; } else if (match.IsToolbelt()) { layout_style_ = LayoutStyle::TOOLBELT; - } else if (match.IsIPHSuggestion()) { + } else if (match.IsIphSuggestion()) { layout_style_ = LayoutStyle::IPH_SUGGESTION; } else if (match.type == AutocompleteMatchType::Type::HISTORY_EMBEDDINGS_ANSWER) {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 58583899..ccec203 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -375,7 +375,7 @@ UpdateDividerLineVisibility(); UpdateFeedbackButtonsVisibility(); UpdateRemoveSuggestionVisibility(); - if (match_.IsIPHSuggestion()) { + if (match_.IsIphSuggestion()) { remove_suggestion_button_->SetTooltipText( l10n_util::GetStringUTF16(IDS_OMNIBOX_CLOSE_IPH_SUGGESTION)); remove_suggestion_button_->GetViewAccessibility().SetName( @@ -481,7 +481,7 @@ GetNativeTheme() && GetNativeTheme()->UserHasContrastPreference(); if (match_.type == AutocompleteMatchType::NULL_RESULT_MESSAGE) { suggestion_view_->content()->ApplyTextColor( - match_.IsIPHSuggestion() ? kColorOmniboxResultsTextDimmed + match_.IsIphSuggestion() ? kColorOmniboxResultsTextDimmed : kColorOmniboxText); } else if (prefers_contrast || force_reapply_styles) { // Normally, OmniboxTextView caches its appearance, but in high contrast, @@ -572,7 +572,7 @@ if (match_.IsToolbelt()) { return OmniboxPartState::TOOLBELT; } - return match_.IsIPHSuggestion() ? OmniboxPartState::IPH + return match_.IsIphSuggestion() ? OmniboxPartState::IPH : OmniboxPartState::NORMAL; }
diff --git a/chrome/browser/ui/views/tabs/glic_button_browsertest.cc b/chrome/browser/ui/views/tabs/glic_button_browsertest.cc index abbd349..9437bc4 100644 --- a/chrome/browser/ui/views/tabs/glic_button_browsertest.cc +++ b/chrome/browser/ui/views/tabs/glic_button_browsertest.cc
@@ -107,7 +107,16 @@ l10n_util::GetStringUTF16(IDS_GLIC_TAB_STRIP_BUTTON_TOOLTIP)); } -IN_PROC_BROWSER_TEST_F(GlicButtonTest, TooltipAndA11yTextWhileGlicFreOpen) { +// TODO(crbug.com/428742560): Re-enable this test for Windows and Linux. +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#define MAYBE_TooltipAndA11yTextWhileGlicFreOpen \ + DISABLED_TooltipAndA11yTextWhileGlicFreOpen +#else +#define MAYBE_TooltipAndA11yTextWhileGlicFreOpen \ + TooltipAndA11yTextWhileGlicFreOpen +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +IN_PROC_BROWSER_TEST_F(GlicButtonTest, + MAYBE_TooltipAndA11yTextWhileGlicFreOpen) { // Toggle to open the FRE dialog. SetFRECompletion(browser()->profile(), prefs::FreStatus::kNotStarted); glic_service()->ToggleUI(browser(), false, @@ -120,14 +129,17 @@ l10n_util::GetStringUTF16(IDS_GLIC_TAB_STRIP_BUTTON_TOOLTIP_CLOSE)); } -// Tests using programmatic window activation are flaky on Linux. -#if BUILDFLAG(IS_LINUX) +// Tests using programmatic window activation are flaky on Linux. This test also +// fails on Windows. +// TODO(crbug.com/428742560): Re-enable this test for Windows and de-flake for +// Linux. +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) #define MAYBE_TooltipAndA11yTextWhileGlicWindowOpen \ DISABLED_TooltipAndA11yTextWhileGlicWindowOpen #else #define MAYBE_TooltipAndA11yTextWhileGlicWindowOpen \ TooltipAndA11yTextWhileGlicWindowOpen -#endif +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) IN_PROC_BROWSER_TEST_F(GlicButtonTest, MAYBE_TooltipAndA11yTextWhileGlicWindowOpen) { // Toggle to open the glic window.
diff --git a/chrome/browser/ui/views/user_education/custom_webui_help_bubble_interactive_uitest.cc b/chrome/browser/ui/views/user_education/custom_webui_help_bubble_interactive_uitest.cc index 51bf3560..b22926f2 100644 --- a/chrome/browser/ui/views/user_education/custom_webui_help_bubble_interactive_uitest.cc +++ b/chrome/browser/ui/views/user_education/custom_webui_help_bubble_interactive_uitest.cc
@@ -153,12 +153,12 @@ // `content::RegisterWebUIControllerInterfaceBinder()`. using Interface = custom_help_bubble::mojom::CustomHelpBubbleHandlerFactory; map->Add<Interface>( - base::BindRepeating([](content::RenderFrameHost* host, - mojo::PendingReceiver<Interface> receiver) { + [](content::RenderFrameHost* host, + mojo::PendingReceiver<Interface> receiver) { CHECK(!host->GetParentOrOuterDocument()); CHECK((content::internal::SafeDownCastAndBindInterface< Interface, TestWebUIHelpBubbleController>(host, receiver))); - })); + }); } };
diff --git a/chrome/browser/ui/webui/ash/settings/pages/people/account_manager_ui_handler_browsertest.cc b/chrome/browser/ui/webui/ash/settings/pages/people/account_manager_ui_handler_browsertest.cc index 15a8a89..d26cf01 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/people/account_manager_ui_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/people/account_manager_ui_handler_browsertest.cc
@@ -9,6 +9,7 @@ #include <ostream> #include "ash/constants/ash_features.h" +#include "ash/constants/ash_switches.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/test/bind.h" @@ -145,6 +146,10 @@ AccountManagerUIHandlerTest& operator=(const AccountManagerUIHandlerTest&) = delete; + void SetUpCommandLine(base::CommandLine* command_line) override { + command_line->AppendSwitch(switches::kLoginManager); + } + void SetUpOnMainThread() override { ash::ProfileHelper::SetProfileToUserForTestingEnabled(true); // Split the setup so it can be called from the inherited classes.
diff --git a/chrome/browser/ui/webui/new_tab_footer/BUILD.gn b/chrome/browser/ui/webui/new_tab_footer/BUILD.gn index 3377aa0..3ee94cd 100644 --- a/chrome/browser/ui/webui/new_tab_footer/BUILD.gn +++ b/chrome/browser/ui/webui/new_tab_footer/BUILD.gn
@@ -62,6 +62,7 @@ public_deps = [ ":new_tab_footer", "//base/test:test_support", + "//chrome/browser/ui:ui_features", "//chrome/test:test_support", ] } @@ -82,10 +83,7 @@ source_set("unit_tests") { testonly = true sources = [ "new_tab_footer_handler_unittest.cc" ] - deps = [ - ":test_support", - "//chrome/browser/ui:ui_features", - ] + deps = [ ":test_support" ] } mojom("mojo_bindings") {
diff --git a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.cc b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.cc index 37bde710..5d2de39 100644 --- a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.cc +++ b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.cc
@@ -6,6 +6,7 @@ #include "base/metrics/histogram_functions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/enterprise/util/managed_browser_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/actions/chrome_action_id.h" #include "chrome/browser/ui/browser_actions.h" @@ -58,6 +59,17 @@ FooterContextMenu::~FooterContextMenu() = default; +bool FooterContextMenu::IsCommandIdVisible(int command_id) const { + switch (command_id) { + case COMMAND_CLOSE_FOOTER: { + bool is_managed = + enterprise_util::CanShowEnterpriseBadgingForNTPFooter(profile_); + return !is_managed; + }; + } + return true; +} + void FooterContextMenu::ExecuteCommand(int command_id, int event_flags) { switch (command_id) { case COMMAND_CLOSE_FOOTER: { @@ -66,7 +78,6 @@ profile_->GetPrefs()->SetBoolean(prefs::kNtpFooterVisible, false); break; } - case COMMAND_SHOW_CUSTOMIZE_CHROME: { new_tab_footer::RecordContextMenuClick( new_tab_footer::FooterContextMenuItem::kCustomizeChrome);
diff --git a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.h b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.h index a98fdba..e377d87 100644 --- a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.h +++ b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu.h
@@ -35,6 +35,7 @@ FooterContextMenu& operator=(const FooterContextMenu&) = delete; // ui::SimpleMenuModel::Delegate: + bool IsCommandIdVisible(int command_id) const override; void ExecuteCommand(int command_id, int event_flags) override; private:
diff --git a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu_browsertest.cc b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu_browsertest.cc index 4f852ed..cf77799 100644 --- a/chrome/browser/ui/webui/new_tab_footer/footer_context_menu_browsertest.cc +++ b/chrome/browser/ui/webui/new_tab_footer/footer_context_menu_browsertest.cc
@@ -17,6 +17,21 @@ #include "content/public/test/browser_test.h" #include "ui/actions/actions.h" +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#include "base/test/scoped_feature_list.h" +#include "chrome/browser/enterprise/browser_management/management_service_factory.h" +#include "chrome/browser/ui/ui_features.h" +#include "components/policy/core/common/management/scoped_management_service_override_for_testing.h" +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + +namespace { +const auto kCustomizeMenuItem = + new_tab_footer::FooterContextMenuItem::kCustomizeChrome; +const auto kHideMenuItem = new_tab_footer::FooterContextMenuItem::kHideFooter; + +const char kMenuClickHistogram[] = "NewTabPage.Footer.ContextMenuClicked"; +} // namespace + class FooterContextMenuBrowserTest : public InProcessBrowserTest { public: FooterContextMenuBrowserTest() = default; @@ -37,6 +52,14 @@ InProcessBrowserTest::TearDownOnMainThread(); } + bool IsCommandIdVisible(new_tab_footer::FooterContextMenuItem menu_item) { + return menu()->IsCommandIdVisible(static_cast<int>(menu_item)); + } + + void ExecuteCommand(new_tab_footer::FooterContextMenuItem menu_item) { + menu()->ExecuteCommand(static_cast<int>(menu_item), /*event_flags=*/0); + } + base::HistogramTester* histogram_tester() { return histogram_tester_.get(); } FooterContextMenu* menu() { return menu_.get(); } Profile* profile() { return browser()->profile(); } @@ -46,17 +69,20 @@ std::unique_ptr<base::HistogramTester> histogram_tester_; }; +IN_PROC_BROWSER_TEST_F(FooterContextMenuBrowserTest, ShowsMenuItems) { + EXPECT_TRUE(IsCommandIdVisible(kHideMenuItem)); + EXPECT_TRUE(IsCommandIdVisible(kCustomizeMenuItem)); +} + IN_PROC_BROWSER_TEST_F(FooterContextMenuBrowserTest, HidesFooter) { ASSERT_TRUE(profile()->GetPrefs()->GetBoolean(prefs::kNtpFooterVisible)); - const std::string& hide_footer = "NewTabPage.Footer.ContextMenuClicked"; - histogram_tester()->ExpectTotalCount(hide_footer, 0); + histogram_tester()->ExpectTotalCount(kMenuClickHistogram, 0); - auto menu_item = new_tab_footer::FooterContextMenuItem::kHideFooter; - menu()->ExecuteCommand(static_cast<int>(menu_item), /*event_flags=*/0); + ExecuteCommand(kHideMenuItem); EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(prefs::kNtpFooterVisible)); - histogram_tester()->ExpectTotalCount(hide_footer, 1); - histogram_tester()->ExpectBucketCount(hide_footer, menu_item, 1); + histogram_tester()->ExpectTotalCount(kMenuClickHistogram, 1); + histogram_tester()->ExpectBucketCount(kMenuClickHistogram, kHideMenuItem, 1); } IN_PROC_BROWSER_TEST_F(FooterContextMenuBrowserTest, OpensCustomizeChrome) { @@ -64,16 +90,51 @@ .FindAction(kActionSidePanelShowCustomizeChrome) ->GetInvokeCount(), 0); - const std::string& customize_chrome = "NewTabPage.Footer.ContextMenuClicked"; - histogram_tester()->ExpectTotalCount(customize_chrome, 0); + histogram_tester()->ExpectTotalCount(kMenuClickHistogram, 0); - auto menu_item = new_tab_footer::FooterContextMenuItem::kCustomizeChrome; - menu()->ExecuteCommand(static_cast<int>(menu_item), /*event_flags=*/0); + ExecuteCommand(kCustomizeMenuItem); ASSERT_EQ(actions::ActionManager::Get() .FindAction(kActionSidePanelShowCustomizeChrome) ->GetInvokeCount(), 1); - histogram_tester()->ExpectTotalCount(customize_chrome, 1); - histogram_tester()->ExpectBucketCount(customize_chrome, menu_item, 1); + histogram_tester()->ExpectTotalCount(kMenuClickHistogram, 1); + histogram_tester()->ExpectBucketCount(kMenuClickHistogram, kCustomizeMenuItem, + 1); } + +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +class FooterContextMenuEnterpriseTest : public FooterContextMenuBrowserTest { + public: + void SetUp() override { + feature_list_.InitAndEnableFeature( + features::kEnterpriseBadgingForNtpFooter); + FooterContextMenuBrowserTest::SetUp(); + } + + void SetUpOnMainThread() override { + // Simulate browser management. + scoped_browser_management_ = + std::make_unique<policy::ScopedManagementServiceOverrideForTesting>( + policy::ManagementServiceFactory::GetForProfile(profile()), + policy::EnterpriseManagementAuthority::DOMAIN_LOCAL); + FooterContextMenuBrowserTest::SetUpOnMainThread(); + } + + void TearDownOnMainThread() override { + scoped_browser_management_.reset(); + FooterContextMenuBrowserTest::TearDownOnMainThread(); + } + + private: + std::unique_ptr<policy::ScopedManagementServiceOverrideForTesting> + scoped_browser_management_; + base::test::ScopedFeatureList feature_list_; +}; + +IN_PROC_BROWSER_TEST_F(FooterContextMenuEnterpriseTest, + HidesCustomizeChromeMenuItem) { + EXPECT_FALSE(IsCommandIdVisible(kHideMenuItem)); + EXPECT_TRUE(IsCommandIdVisible(kCustomizeMenuItem)); +} +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler.cc b/chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler.cc index dd632781..63295f2 100644 --- a/chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler.cc +++ b/chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler.cc
@@ -127,10 +127,7 @@ } void NewTabFooterHandler::ShowContextMenu(const gfx::Point& point) { - // TODO(crbug.com/424878134): Add managed-specific behavior, this currently - // hides the menu if the browser is managed. - if (!embedder_ || - enterprise_util::CanShowEnterpriseBadgingForNTPFooter(profile_)) { + if (!embedder_) { return; } @@ -138,7 +135,7 @@ if (browser) { embedder_->ShowContextMenu(point, std::make_unique<FooterContextMenu>(browser)); - }; + } } void NewTabFooterHandler::UpdateManagementNotice() {
diff --git a/chrome/browser/web_applications/proto/web_app.proto b/chrome/browser/web_applications/proto/web_app.proto index 30d3d9e..6423fa2 100644 --- a/chrome/browser/web_applications/proto/web_app.proto +++ b/chrome/browser/web_applications/proto/web_app.proto
@@ -181,6 +181,16 @@ optional uint32 attempt_count = 4; // Required. } +// Stores the pending updates for security sensitive members. Saved when an +// update is registered in the ManifestSilentUpdateCommand, and used to show +// update UX. At least one field should be populated. If the icon is populated, +// the url, size, and purpose must all be populated. +message PendingUpdateInfo { + optional string name = 1; + optional string short_name = 2; + repeated sync_pb.WebAppIconInfo manifest_icons = 3; +} + // Full WebApp object data. See detailed comments in // chrome/browser/web_applications/web_app.h. Note on database identities: // app_id is a hash of launch_url. app_id is the client tag for sync system. @@ -458,4 +468,8 @@ optional bool diy_app_icons_masked_on_mac = 71; reserved 72; + + // Populated when there is a pending update to security sensitive members. If + // not populated, then no update is registered. + optional PendingUpdateInfo pending_update_info = 73; }
diff --git a/chrome/browser/web_applications/test/web_app_test_utils.cc b/chrome/browser/web_applications/test/web_app_test_utils.cc index 2f21d780..b7a85c2 100644 --- a/chrome/browser/web_applications/test/web_app_test_utils.cc +++ b/chrome/browser/web_applications/test/web_app_test_utils.cc
@@ -1159,6 +1159,47 @@ app->SetRelatedApplications(CreateRandomRelatedApplications(random)); app->SetDiyAppIconsMaskedOnMac(random.next_bool()); + if (random.next_bool()) { + proto::PendingUpdateInfo pending_update_info; + if (random.next_bool()) { + pending_update_info.set_name(name); + } + if (random.next_bool()) { + pending_update_info.set_short_name("random_short_name_" + seed_str); + } + + if (random.next_bool() || (!pending_update_info.has_name() && + !pending_update_info.has_short_name())) { + const std::vector<int> possible_icon_sizes = {16, 32, 48, 64, 96, + 128, 192, 256, 512}; + // Icons to update should not be zero. + const int pending_update_icons = random.next_uint(10) + 1; + for (int i = 0; i < pending_update_icons; i++) { + apps::IconInfo icon; + icon.url = params.base_url.Resolve( + "/icon" + base::NumberToString(random.next_uint())); + size_t random_size_index = + random.next_uint() % possible_icon_sizes.size(); + icon.square_size_px = possible_icon_sizes[random_size_index]; + + int purpose = random.next_uint(3); + if (purpose == 0) { + icon.purpose = apps::IconInfo::Purpose::kAny; + } + if (purpose == 1) { + icon.purpose = apps::IconInfo::Purpose::kMaskable; + } + if (purpose == 2) { + icon.purpose = apps::IconInfo::Purpose::kMonochrome; + } + sync_pb::WebAppIconInfo* sync_icon = + pending_update_info.add_manifest_icons(); + *sync_icon = AppIconInfoToSyncProto(icon); + } + } + app->SetPendingUpdateInfo(pending_update_info); + } + return app; }
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 48296e5..3483889 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc
@@ -6,6 +6,7 @@ #include <array> #include <bitset> +#include <optional> #include <ostream> #include <string> #include <tuple> @@ -326,8 +327,47 @@ } return base::Value(std::move(related_applications_json)); } + +base::Value PendingUpdateInfoToDebugValue( + const std::optional<proto::PendingUpdateInfo> pending_update_info) { + if (!pending_update_info) { + return base::Value(); + } + + base::Value::Dict debug_dict; + if (pending_update_info->has_name()) { + debug_dict.Set("name", pending_update_info->name()); + } + if (pending_update_info->has_short_name()) { + debug_dict.Set("short_name", pending_update_info->short_name()); + } + if (!pending_update_info->manifest_icons().empty()) { + base::Value::List manifest_icons; + for (const auto& icon_info : pending_update_info->manifest_icons()) { + base::Value::Dict icon_dict; + icon_dict.Set("url", icon_info.url()); + icon_dict.Set("icon_square_size_px", icon_info.size_in_px()); + icon_dict.Set("icon_purpose", icon_info.purpose()); + + manifest_icons.Append(std::move(icon_dict)); + } + debug_dict.Set("manifest_icons", std::move(manifest_icons)); + } + + return base::Value(std::move(debug_dict)); +} } // namespace +namespace proto { + +bool operator==(const PendingUpdateInfo& pending_update_info1, + const PendingUpdateInfo& pending_update_info2) { + return pending_update_info1.SerializeAsString() == + pending_update_info2.SerializeAsString(); +} + +} // namespace proto + WebApp::CachedDerivedData::CachedDerivedData() = default; WebApp::CachedDerivedData::~CachedDerivedData() = default; WebApp::CachedDerivedData::CachedDerivedData(CachedDerivedData&&) = default; @@ -914,6 +954,19 @@ generated_icon_fix_ = generated_icon_fix; } +void WebApp::SetPendingUpdateInfo( + std::optional<proto::PendingUpdateInfo> pending_update_info) { + CHECK(pending_update_info->has_name() || + pending_update_info->has_short_name() || + !pending_update_info->manifest_icons().empty()); + if (!pending_update_info->manifest_icons().empty()) { + for (const auto& icon : pending_update_info->manifest_icons()) { + CHECK(icon.has_url() && icon.has_size_in_px() && icon.has_purpose()); + } + } + pending_update_info_ = std::move(pending_update_info); +} + WebApp::ClientData::ClientData() = default; WebApp::ClientData::~ClientData() = default; @@ -1057,7 +1110,8 @@ app.is_diy_app_, app.was_shortcut_app_, app.related_applications_, - app.diy_app_icons_masked_on_mac_ + app.diy_app_icons_masked_on_mac_, + app.pending_update_info_ // clang-format on ); }; @@ -1275,6 +1329,9 @@ root.Set("related_applications", RelatedApplicationsToDebugValue(related_applications_)); + root.Set("pending_update_info", + PendingUpdateInfoToDebugValue(pending_update_info_)); + return base::Value(std::move(root)); }
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index 32757035..87ad07eb 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h
@@ -390,6 +390,10 @@ return related_applications_; } + const std::optional<proto::PendingUpdateInfo>& pending_update_info() const { + return pending_update_info_; + } + // A Web App can be installed from multiple sources simultaneously. Installs // add a source to the app. Uninstalls remove a source from the app. void AddSource(WebAppManagement::Type source); @@ -491,6 +495,8 @@ void SetDiyAppIconsMaskedOnMac(bool diy_app_icons_masked_on_mac); void SetRelatedApplications( std::vector<blink::Manifest::RelatedApplication> related_applications); + void SetPendingUpdateInfo( + std::optional<proto::PendingUpdateInfo> pending_update_info); void AddPlaceholderInfoToManagementExternalConfigMap( WebAppManagement::Type source_type, @@ -638,11 +644,13 @@ std::vector<blink::Manifest::RelatedApplication> related_applications_; + std::optional<proto::PendingUpdateInfo> pending_update_info_; + // New fields must be added to: // - |operator==| // - AsDebugValue() - // - WebAppDatabase::CreateWebApp() - // - WebAppDatabase::CreateWebAppProto() + // - WebAppDatabaseSerialization::ParseWebAppProto() + // - WebAppDatabaseSerialization::WebAppToProto() // - CreateRandomWebApp() // - web_app.proto // If parsed from manifest, also add to:
diff --git a/chrome/browser/web_applications/web_app_database_serialization.cc b/chrome/browser/web_applications/web_app_database_serialization.cc index 812e8df..81c0f1bb1 100644 --- a/chrome/browser/web_applications/web_app_database_serialization.cc +++ b/chrome/browser/web_applications/web_app_database_serialization.cc
@@ -1359,6 +1359,22 @@ } web_app->SetRelatedApplications(std::move(related_applications)); + if (proto.has_pending_update_info()) { + if (!proto.pending_update_info().has_name() && + !proto.pending_update_info().has_short_name() && + proto.pending_update_info().manifest_icons().empty()) { + return nullptr; + } + if (!proto.pending_update_info().manifest_icons().empty()) { + for (const auto& icon : proto.pending_update_info().manifest_icons()) { + if (!icon.has_url() || !icon.has_size_in_px() || !icon.has_purpose()) { + return nullptr; + } + } + } + web_app->SetPendingUpdateInfo(proto.pending_update_info()); + } + return web_app; } @@ -1877,6 +1893,18 @@ } } + if (web_app.pending_update_info().has_value()) { + CHECK(web_app.pending_update_info()->has_name() || + web_app.pending_update_info()->has_short_name() || + !web_app.pending_update_info()->manifest_icons().empty()); + if (!web_app.pending_update_info()->manifest_icons().empty()) { + for (const auto& icon : web_app.pending_update_info()->manifest_icons()) { + CHECK(icon.has_url() && icon.has_size_in_px() && icon.has_purpose()); + } + } + *local_data->mutable_pending_update_info() = *web_app.pending_update_info(); + } + return local_data; }
diff --git a/chrome/browser/web_applications/web_app_database_serialization_unittest.cc b/chrome/browser/web_applications/web_app_database_serialization_unittest.cc index 120d015..9c3f7ec 100644 --- a/chrome/browser/web_applications/web_app_database_serialization_unittest.cc +++ b/chrome/browser/web_applications/web_app_database_serialization_unittest.cc
@@ -554,5 +554,92 @@ EXPECT_THAT(ParseWebAppProto(proto), IsNull()); } +// --- Tests for PendingUpdateInfo --- +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_InvalidPendingUpdateInfo) { + proto::WebApp proto = + CreateWebAppProtoForTesting("Test App", GURL("https://example.com/")); + auto* fix = proto.mutable_pending_update_info(); + fix->Clear(); + + EXPECT_THAT(ParseWebAppProto(proto), IsNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_HasPendingUpdateInfo_NewName) { + proto::WebApp proto = + CreateWebAppProtoForTesting("Test App", GURL("https://example.com/")); + auto* fix = proto.mutable_pending_update_info(); + fix->set_name("Pending Update Name"); + + EXPECT_THAT(ParseWebAppProto(proto), NotNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_HasPendingUpdateInfo_NewShortName) { + proto::WebApp proto = + CreateWebAppProtoForTesting("Test App", GURL("https://example.com/")); + auto* fix = proto.mutable_pending_update_info(); + fix->set_short_name("Pending Update Short Name"); + + EXPECT_THAT(ParseWebAppProto(proto), NotNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_HasPendingUpdateInfo_NewIcon) { + GURL start_url("https://example.com/"); + proto::WebApp proto = CreateWebAppProtoForTesting("Test App", start_url); + auto* fix = proto.mutable_pending_update_info(); + + sync_pb::WebAppIconInfo* icon1 = fix->add_manifest_icons(); + icon1->set_url(start_url.Resolve(std::string("/icon") + "1000").spec()); + icon1->set_purpose( + sync_pb::WebAppIconInfo_Purpose::WebAppIconInfo_Purpose_ANY); + icon1->set_size_in_px(256); + + EXPECT_THAT(ParseWebAppProto(proto), NotNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_InvalidPendingUpdateInfo_MissingIconUrl) { + GURL start_url("https://example.com/"); + proto::WebApp proto = CreateWebAppProtoForTesting("Test App", start_url); + auto* fix = proto.mutable_pending_update_info(); + + sync_pb::WebAppIconInfo* icon1 = fix->add_manifest_icons(); + icon1->set_purpose( + sync_pb::WebAppIconInfo_Purpose::WebAppIconInfo_Purpose_ANY); + icon1->set_size_in_px(256); + + EXPECT_THAT(ParseWebAppProto(proto), IsNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_InvalidPendingUpdateInfo_MissingIconPurpose) { + GURL start_url("https://example.com/"); + proto::WebApp proto = CreateWebAppProtoForTesting("Test App", start_url); + auto* fix = proto.mutable_pending_update_info(); + + sync_pb::WebAppIconInfo* icon1 = fix->add_manifest_icons(); + icon1->set_url(start_url.Resolve(std::string("/icon") + "1000").spec()); + icon1->set_size_in_px(256); + + EXPECT_THAT(ParseWebAppProto(proto), IsNull()); +} + +TEST_F(WebAppDatabaseSerializationTest, + ParseWebAppProto_InvalidPendingUpdateInfo_MissingIconSizeInPx) { + GURL start_url("https://example.com/"); + proto::WebApp proto = CreateWebAppProtoForTesting("Test App", start_url); + auto* fix = proto.mutable_pending_update_info(); + + sync_pb::WebAppIconInfo* icon1 = fix->add_manifest_icons(); + icon1->set_url(start_url.Resolve(std::string("/icon") + "1000").spec()); + icon1->set_purpose( + sync_pb::WebAppIconInfo_Purpose::WebAppIconInfo_Purpose_ANY); + + EXPECT_THAT(ParseWebAppProto(proto), IsNull()); +} + } // namespace } // namespace web_app
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index f6fd3c8..f23ee4e 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1751273889-58d11a83ef8d91773076c2d3264c90f7468a6f56-30329b43767f7e55f51a1015e9a1ddc0bbe778a4.profdata +chrome-win32-main-1751306388-a362bf62ad1a506d6d9f48a28bd97c937a8173e6-e0c6b30c3cf69bbbe308c1f1d1000d9ebcc8e8ab.profdata
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index babdaf4..25aad7a 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc
@@ -323,23 +323,24 @@ // Sets up the client side of the multi-process heap profiler service. // TODO(crbug.com/40915258): Hook up chrome://memory-internals to the // in-process heap profiler, and delete this service. - binders->Add<heap_profiling::mojom::ProfilingClient>( - base::BindRepeating( + binders + ->Add<heap_profiling::mojom::ProfilingClient>( + [](mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient> receiver) { static base::NoDestructor<heap_profiling::ProfilingClient> profiling_client; profiling_client->BindToInterface(std::move(receiver)); - }), - io_task_runner); + }, + io_task_runner); // Sets up the simplified in-process heap profiler, if it's enabled. const auto* heap_profiler_controller = heap_profiling::HeapProfilerController::GetInstance(); if (heap_profiler_controller && heap_profiler_controller->IsEnabled()) { binders->Add<heap_profiling::mojom::SnapshotController>( - base::BindRepeating(&heap_profiling::ChildProcessSnapshotController:: - CreateSelfOwnedReceiver), + &heap_profiling::ChildProcessSnapshotController:: + CreateSelfOwnedReceiver, // ChildProcessSnapshotController calls into HeapProfilerController, // which can only be accessed on this sequence. base::SequencedTaskRunner::GetCurrentDefault());
diff --git a/chrome/common/chromeos/extensions/manifest_tests/extension_manifests_chromeos_system_extension_unittest.cc b/chrome/common/chromeos/extensions/manifest_tests/extension_manifests_chromeos_system_extension_unittest.cc index 4831080..322f02f 100644 --- a/chrome/common/chromeos/extensions/manifest_tests/extension_manifests_chromeos_system_extension_unittest.cc +++ b/chrome/common/chromeos/extensions/manifest_tests/extension_manifests_chromeos_system_extension_unittest.cc
@@ -16,7 +16,8 @@ namespace chromeos { namespace { -using ExtensionManifestChromeOSSystemExtensionTest = ChromeManifestTest; +using ExtensionManifestChromeOSSystemExtensionTest = + extensions::ChromeManifestTest; TEST_F(ExtensionManifestChromeOSSystemExtensionTest, InvalidChromeOSSystemExtension) {
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc index 99393b1..72604ac 100644 --- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc +++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
@@ -17,13 +17,10 @@ namespace errors = extensions::manifest_errors; -using extensions::Extension; -using extensions::ExtensionBuilder; - +namespace extensions { namespace { -class FileBrowserHandlerManifestTest : public ChromeManifestTest { -}; +using FileBrowserHandlerManifestTest = ChromeManifestTest; TEST_F(FileBrowserHandlerManifestTest, PermissionAllowed) { RunTestcase(Testcase("filebrowser_valid.json"), EXPECT_TYPE_SUCCESS); @@ -49,23 +46,22 @@ good_manifest.Set("permissions", base::Value::List().Append("fileBrowserHandler")); - extensions::ExtensionBuilder bad_app_builder; + ExtensionBuilder bad_app_builder; bad_app_builder.SetManifest(std::move(bad_manifest)); - scoped_refptr<const extensions::Extension> bad_app = bad_app_builder.Build(); + scoped_refptr<const Extension> bad_app = bad_app_builder.Build(); EXPECT_FALSE(FileBrowserHandler::GetHandlers(bad_app.get())); - extensions::ExtensionBuilder good_app_builder; + ExtensionBuilder good_app_builder; good_app_builder.SetManifest(std::move(good_manifest)); - scoped_refptr<const extensions::Extension> good_app = - good_app_builder.Build(); + scoped_refptr<const Extension> good_app = good_app_builder.Build(); EXPECT_TRUE(FileBrowserHandler::GetHandlers(good_app.get())); } TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) { const Testcase testcases[] = { Testcase("filebrowser_invalid_access_permission.json", - extensions::ErrorUtils::FormatErrorMessage( - errors::kInvalidFileAccessValue, base::NumberToString(1))), + ErrorUtils::FormatErrorMessage(errors::kInvalidFileAccessValue, + base::NumberToString(1))), Testcase("filebrowser_invalid_access_permission_list.json", errors::kInvalidFileAccessList), Testcase("filebrowser_invalid_empty_access_permission_list.json", @@ -83,11 +79,11 @@ Testcase("filebrowser_invalid_file_filters_1.json", errors::kInvalidFileFiltersList), Testcase("filebrowser_invalid_file_filters_2.json", - extensions::ErrorUtils::FormatErrorMessage( - errors::kInvalidFileFilterValue, base::NumberToString(0))), + ErrorUtils::FormatErrorMessage(errors::kInvalidFileFilterValue, + base::NumberToString(0))), Testcase("filebrowser_invalid_file_filters_url.json", - extensions::ErrorUtils::FormatErrorMessage( - errors::kInvalidURLPatternError, "http:*.html"))}; + ErrorUtils::FormatErrorMessage(errors::kInvalidURLPatternError, + "http:*.html"))}; RunTestcases(testcases, EXPECT_TYPE_ERROR); RunTestcase(Testcase("filebrowser_missing_permission.json", errors::kInvalidFileBrowserHandlerMissingPermission), @@ -124,7 +120,7 @@ EXPECT_EQ("ExtremelyCoolAction", action->id()); EXPECT_EQ("Be Amazed", action->title()); EXPECT_EQ("icon.png", action->icon_path()); - const extensions::URLPatternSet& patterns = action->file_url_patterns(); + const URLPatternSet& patterns = action->file_url_patterns(); ASSERT_EQ(1U, patterns.patterns().size()); EXPECT_TRUE(action->MatchesURL( GURL("filesystem:chrome-extension://foo/local/test.txt"))); @@ -166,7 +162,7 @@ ASSERT_EQ(1U, handlers->size()); const FileBrowserHandler* action = handlers->at(0).get(); - const extensions::URLPatternSet& patterns = action->file_url_patterns(); + const URLPatternSet& patterns = action->file_url_patterns(); ASSERT_EQ(1U, patterns.patterns().size()); EXPECT_TRUE(action->MatchesURL( GURL("filesystem:chrome-extension://foo/local/test.txt"))); @@ -204,7 +200,7 @@ ASSERT_TRUE(handlers != nullptr); ASSERT_EQ(1U, handlers->size()); const FileBrowserHandler* action = handlers->at(0).get(); - const extensions::URLPatternSet& patterns = action->file_url_patterns(); + const URLPatternSet& patterns = action->file_url_patterns(); EXPECT_EQ(0U, patterns.patterns().size()); EXPECT_TRUE(action->HasCreateAccessPermission()); @@ -217,3 +213,4 @@ } } // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/chrome_manifest_test.cc b/chrome/common/extensions/manifest_tests/chrome_manifest_test.cc index a67ec674..9a244f8f 100644 --- a/chrome/common/extensions/manifest_tests/chrome_manifest_test.cc +++ b/chrome/common/extensions/manifest_tests/chrome_manifest_test.cc
@@ -9,6 +9,8 @@ #include "chrome/common/chrome_paths.h" #include "components/version_info/version_info.h" +namespace extensions { + ChromeManifestTest::ChromeManifestTest() // CHANNEL_UNKNOWN == trunk. : current_channel_(version_info::Channel::UNKNOWN) {} @@ -20,3 +22,5 @@ base::PathService::Get(chrome::DIR_TEST_DATA, &path); return path.AppendASCII("extensions").AppendASCII("manifest_tests"); } + +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/chrome_manifest_test.h b/chrome/common/extensions/manifest_tests/chrome_manifest_test.h index c6731c3..a6f6fbf9 100644 --- a/chrome/common/extensions/manifest_tests/chrome_manifest_test.h +++ b/chrome/common/extensions/manifest_tests/chrome_manifest_test.h
@@ -8,10 +8,10 @@ #include "extensions/common/features/feature_channel.h" #include "extensions/common/manifest_test.h" +namespace extensions { + // Base class for unit tests that load manifest data from Chrome TEST_DATA_DIR. -// TODO(jamescook): Move this class and all subclasses into the extensions -// namespace. -class ChromeManifestTest : public extensions::ManifestTest { +class ChromeManifestTest : public ManifestTest { public: ChromeManifestTest(); @@ -30,7 +30,9 @@ // // These objects nest, so if a test wants to explicitly test the behaviour // on stable or beta, declare it inside that test. - extensions::ScopedCurrentChannel current_channel_; + ScopedCurrentChannel current_channel_; }; +} // namespace extensions + #endif // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc index dfeb201..56742d3 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc
@@ -9,7 +9,8 @@ namespace errors = extensions::manifest_errors; namespace keys = extensions::manifest_keys; -using extensions::ErrorUtils; + +namespace extensions { using ContentSecurityPolicyManifestTest = ChromeManifestTest; @@ -31,3 +32,5 @@ keys::kContentSecurityPolicy, "object-src"))}; RunTestcases(testcases, EXPECT_TYPE_WARNING); } + +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc index 28ce760..de5a045b 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc
@@ -6,8 +6,11 @@ #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" +namespace extensions { +namespace { + TEST_F(ChromeManifestTest, DefaultPathForExtent) { - scoped_refptr<extensions::Extension> extension( + scoped_refptr<Extension> extension( LoadAndExpectSuccess("default_path_for_extent.json")); ASSERT_EQ(1u, extension->web_extent().patterns().size()); @@ -15,3 +18,6 @@ EXPECT_TRUE(extension->web_extent().MatchesURL( GURL("http://www.google.com/monkey"))); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc index bcc2c32..3d915c7 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc
@@ -14,32 +14,31 @@ #include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" +namespace extensions { + +namespace { + using DevToolsPageManifestTest = ChromeManifestTest; TEST_F(DevToolsPageManifestTest, DevToolsExtensions) { LoadAndExpectError("devtools_extension_url_invalid_type.json", - extensions::manifest_errors::kInvalidDevToolsPage); + manifest_errors::kInvalidDevToolsPage); LoadAndExpectError("devtools_extension_invalid_page_url.json", - extensions::manifest_errors::kInvalidDevToolsPage); + manifest_errors::kInvalidDevToolsPage); LoadAndExpectError("devtools_extension_page_url_https.json", - extensions::manifest_errors::kInvalidDevToolsPage); + manifest_errors::kInvalidDevToolsPage); - scoped_refptr<extensions::Extension> extension = + scoped_refptr<Extension> extension = LoadAndExpectSuccess("devtools_extension.json"); EXPECT_EQ(extension->url().spec() + "devtools.html", - extensions::chrome_manifest_urls::GetDevToolsPage(extension.get()) - .spec()); + chrome_manifest_urls::GetDevToolsPage(extension.get()).spec()); EXPECT_TRUE(extension->permissions_data() ->active_permissions() .HasEffectiveAccessToAllHosts()); } -namespace extensions { - -namespace { - class ManifestDevToolsPageHandlerTest : public ManifestTest { public: ManifestDevToolsPageHandlerTest() = default; @@ -66,8 +65,7 @@ ASSERT_TRUE(extension.get()); EXPECT_TRUE(error.empty()); ASSERT_EQ(parsed_devtools_page, - extensions::chrome_manifest_urls::GetDevToolsPage(extension.get()) - .spec()); + chrome_manifest_urls::GetDevToolsPage(extension.get()).spec()); } void LoadAndExpectSuccess(const std::string& id,
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc index ef33893..09c505e 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc
@@ -11,7 +11,8 @@ #include "extensions/common/switches.h" #include "testing/gtest/include/gtest/gtest.h" -namespace errors = extensions::manifest_errors; +namespace extensions { +namespace { TEST_F(ChromeManifestTest, ExperimentalPermission) { LoadAndExpectWarning( @@ -19,11 +20,13 @@ "'experimental' requires the 'experimental-extension-apis' " "command line switch to be enabled."); LoadAndExpectSuccess("experimental.json", - extensions::mojom::ManifestLocation::kComponent); - LoadAndExpectSuccess("experimental.json", - extensions::mojom::ManifestLocation::kInternal, - extensions::Extension::FROM_WEBSTORE); + mojom::ManifestLocation::kComponent); + LoadAndExpectSuccess("experimental.json", mojom::ManifestLocation::kInternal, + Extension::FROM_WEBSTORE); base::CommandLine::ForCurrentProcess()->AppendSwitch( - extensions::switches::kEnableExperimentalExtensionApis); + switches::kEnableExperimentalExtensionApis); LoadAndExpectSuccess("experimental.json"); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc index 7e4b217..d86952d 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc
@@ -14,7 +14,7 @@ using IconsManifestTest = ChromeManifestTest; TEST_F(IconsManifestTest, NormalizeIconPaths) { - scoped_refptr<extensions::Extension> extension( + scoped_refptr<Extension> extension( LoadAndExpectSuccess("normalize_icon_paths.json")); const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get()); @@ -25,7 +25,7 @@ } TEST_F(IconsManifestTest, IconSizes) { - scoped_refptr<extensions::Extension> extension( + scoped_refptr<Extension> extension( LoadAndExpectSuccess("init_icon_size.json")); const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc index 75ebdfc..502d051 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc
@@ -10,9 +10,10 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::Extension; +namespace extensions { +namespace { -namespace errors = extensions::manifest_errors; +namespace errors = manifest_errors; TEST_F(ChromeManifestTest, ManifestVersionError) { base::Value::Dict mv_missing; @@ -74,13 +75,16 @@ if (!entry.expected_error.empty()) { LoadAndExpectError( ManifestData(std::move(entry.manifest), entry.test_name), - extensions::ErrorUtils::FormatErrorMessage( - entry.expected_error, "either 2 or 3", "extensions"), - extensions::mojom::ManifestLocation::kUnpacked, create_flags); + ErrorUtils::FormatErrorMessage(entry.expected_error, "either 2 or 3", + "extensions"), + mojom::ManifestLocation::kUnpacked, create_flags); } else { LoadAndExpectSuccess( ManifestData(std::move(entry.manifest), entry.test_name), - extensions::mojom::ManifestLocation::kUnpacked, create_flags); + mojom::ManifestLocation::kUnpacked, create_flags); } } } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_name_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_name_unittest.cc index 9fa77249..41b8a82 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_name_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_name_unittest.cc
@@ -8,7 +8,7 @@ #include "content/public/test/browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::Extension; +namespace extensions { class NameManifestTest : public ChromeManifestTest { protected: @@ -54,3 +54,5 @@ "Required value 'name' is missing or invalid."); } } + +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc index c6190cdc..edbedcd1 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc
@@ -8,13 +8,18 @@ #include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" +namespace extensions { +namespace { + // Tests that the old permission name "unlimited_storage" still works for // backwards compatibility (we renamed it to "unlimitedStorage"). TEST_F(ChromeManifestTest, OldUnlimitedStoragePermission) { - scoped_refptr<extensions::Extension> extension = - LoadAndExpectSuccess("old_unlimited_storage.json", - extensions::mojom::ManifestLocation::kInternal, - extensions::Extension::NO_FLAGS); + scoped_refptr<Extension> extension = LoadAndExpectSuccess( + "old_unlimited_storage.json", mojom::ManifestLocation::kInternal, + Extension::NO_FLAGS); EXPECT_TRUE(extension->permissions_data()->HasAPIPermission( - extensions::mojom::APIPermissionID::kUnlimitedStorage)); + mojom::APIPermissionID::kUnlimitedStorage)); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc index 60f8f41..d17e9cfe 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
@@ -13,6 +13,7 @@ using extensions::FeatureSwitch; using extensions::OptionsPageInfo; +namespace extensions { namespace { class OptionsPageManifestTest : public ChromeManifestTest { @@ -148,3 +149,4 @@ } } // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc index ccd4d731..5a47393 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
@@ -10,7 +10,9 @@ #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" -namespace errors = extensions::manifest_errors; +namespace extensions { + +namespace errors = manifest_errors; using URLOverridesManifestTest = ChromeManifestTest; @@ -23,19 +25,20 @@ extension = LoadAndExpectSuccess("override_new_tab.json"); EXPECT_EQ(extension->url().spec() + "newtab.html", - extensions::URLOverrides::GetChromeURLOverrides(extension.get()) - .find("newtab")->second.spec()); + URLOverrides::GetChromeURLOverrides(extension.get()) + .find("newtab") + ->second.spec()); extension = LoadAndExpectSuccess("override_history.json"); EXPECT_EQ(extension->url().spec() + "history.html", - extensions::URLOverrides::GetChromeURLOverrides(extension.get()) - .find("history")->second.spec()); + URLOverrides::GetChromeURLOverrides(extension.get()) + .find("history") + ->second.spec()); // An extension which specifies an invalid override should still load for // future compatibility. extension = LoadAndExpectSuccess("override_invalid_page.json"); - EXPECT_TRUE( - extensions::URLOverrides::GetChromeURLOverrides(extension.get()).empty()); + EXPECT_TRUE(URLOverrides::GetChromeURLOverrides(extension.get()).empty()); // "keyboard" property is only available on ChromeOS Ash. extension = LoadAndExpectSuccess("override_keyboard_page.json"); @@ -45,7 +48,8 @@ .find("keyboard") ->second.spec()); #else - EXPECT_TRUE( - extensions::URLOverrides::GetChromeURLOverrides(extension.get()).empty()); + EXPECT_TRUE(URLOverrides::GetChromeURLOverrides(extension.get()).empty()); #endif } + +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc index 23dc067c..640e667 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc
@@ -6,7 +6,13 @@ #include "testing/gtest/include/gtest/gtest.h" +namespace extensions { +namespace { + TEST_F(ChromeManifestTest, PortsInPermissions) { // Loading as a user would shoud not trigger an error. LoadAndExpectSuccess("ports_in_permissions.json"); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc index b6fafb92..dc5fe51a 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc
@@ -11,19 +11,21 @@ #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" #include "testing/gtest/include/gtest/gtest.h" +namespace extensions { +namespace { + using ValidAppManifestTest = ChromeManifestTest; TEST_F(ValidAppManifestTest, ValidApp) { - scoped_refptr<extensions::Extension> extension( - LoadAndExpectSuccess("valid_app.json")); - extensions::URLPatternSet expected_patterns; + scoped_refptr<Extension> extension(LoadAndExpectSuccess("valid_app.json")); + URLPatternSet expected_patterns; AddPattern(&expected_patterns, "http://www.google.com/mail/*"); AddPattern(&expected_patterns, "http://www.google.com/foobar/*"); EXPECT_EQ(expected_patterns, extension->web_extent()); EXPECT_EQ(apps::LaunchContainer::kLaunchContainerTab, - extensions::AppLaunchInfo::GetLaunchContainer(extension.get())); + AppLaunchInfo::GetLaunchContainer(extension.get())); EXPECT_EQ(GURL("http://www.google.com/mail/"), - extensions::AppLaunchInfo::GetLaunchWebURL(extension.get())); + AppLaunchInfo::GetLaunchWebURL(extension.get())); } TEST_F(ValidAppManifestTest, AllowUnrecognizedPermissions) { @@ -36,3 +38,6 @@ permissions->Append("not-a-valid-permission"); LoadAndExpectSuccess(ManifestData(std::move(*manifest), "")); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc index c819e32..9ba485a 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc
@@ -9,8 +9,8 @@ #include "content/public/test/browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::Extension; -using extensions::WebAccessibleResourcesInfo; +namespace extensions { +namespace { class WebAccessibleResourcesManifestTest : public ChromeManifestTest { protected: @@ -482,3 +482,6 @@ EXPECT_EQ(false, WebAccessibleResourcesInfo::ShouldUseDynamicUrl( extension.get(), "resource.html")); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc index 419b6f9..2543bb5 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc
@@ -9,10 +9,10 @@ #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::ErrorUtils; -using extensions::Extension; +namespace extensions { +namespace { -namespace errors = extensions::manifest_errors; +namespace errors = manifest_errors; TEST_F(ChromeManifestTest, AppWebUrls) { const Testcase testcases[] = { @@ -48,3 +48,6 @@ EXPECT_EQ("*://www.google.com/*", extension->web_extent().patterns().begin()->GetAsString()); } + +} // namespace +} // namespace extensions
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc index bdaec607..fcec769 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc
@@ -8,10 +8,10 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/webview_info.h" -using extensions::ErrorUtils; -using extensions::Extension; -using extensions::WebviewInfo; -namespace errors = extensions::manifest_errors; +namespace extensions { +namespace { + +namespace errors = manifest_errors; using WebviewAccessibleResourcesManifestTest = ChromeManifestTest; @@ -96,3 +96,6 @@ extension.get(), "nonrelative", "a.html")); } } + +} // namespace +} // namespace extensions
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index d5a17dd..47f97bd 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -802,6 +802,7 @@ "//chrome/browser/themes", "//chrome/browser/ui/apps", "//chrome/browser/ui/find_bar", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/views/page_action:page_action", "//chrome/browser/ui/webui/signin", "//chrome/browser/ui/webui/signin:signin_utils", @@ -3885,8 +3886,10 @@ "//chrome/browser/contextual_cueing", "//chrome/browser/contextual_cueing:impl", "//chrome/browser/infobars:test_support", + "//chrome/browser/resource_coordinator", "//chrome/browser/supervised_user", "//chrome/browser/ui/extensions", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/search", "//chrome/browser/ui/toolbar", "//chrome/browser/ui/toolbar/chrome_labs", @@ -4503,6 +4506,7 @@ "../browser/extensions/chrome_app_api_browsertest.cc", "../browser/extensions/chrome_test_extension_loader_browsertest.cc", "../browser/extensions/chrome_theme_url_browsertest.cc", + "../browser/extensions/component_extension_browsertest.cc", "../browser/extensions/content_capabilities_browsertest.cc", "../browser/extensions/content_script_apitest.cc", "../browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc", @@ -4632,7 +4636,6 @@ sources += [ "../browser/extensions/api/identity/launch_web_auth_flow_delegate_ash_browsertest.cc", - "../browser/extensions/component_extension_browsertest.cc", "../browser/ui/views/extensions/web_file_handlers/web_file_handlers_file_launch_browsertest.cc", ] } @@ -4713,6 +4716,7 @@ "../browser/extensions/api/automation/automation_apitest.cc", "../browser/extensions/api/image_writer_private/image_writer_private_apitest.cc", "../browser/extensions/api/proxy/proxy_apitest.cc", + "../browser/ui/extensions/extension_uninstall_dialog_impl_browsertest.cc", ] if (is_chromeos) { @@ -4911,7 +4915,6 @@ "../browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc", "../browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc", "../browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc", - "../browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc", "../browser/ui/views/extensions/extensions_dialogs_browsertest.cc", "../browser/ui/views/extensions/extensions_dialogs_browsertest.h", "../browser/ui/views/extensions/extensions_request_access_hover_card_coordinator_browsertest.cc", @@ -7676,7 +7679,6 @@ "../browser/profiles/android/profile_resolver_unittest.cc", "../browser/readaloud/android/prefs_unittest.cc", "../browser/search/contextual_search_policy_handler_android_unittest.cc", - "../browser/segmentation_platform/client_util/tab_data_collection_util_unittest.cc", "../browser/sharing/click_to_call/click_to_call_message_handler_android_unittest.cc", "../browser/sharing/optimization_guide/optimization_guide_message_handler_unittest.cc", "../browser/sharing/sms/sms_fetch_request_handler_unittest.cc", @@ -8203,10 +8205,12 @@ "//chrome/browser/actor:unit_tests", "//chrome/browser/actor/ui:unit_tests", "//chrome/browser/contextual_cueing:unit_tests", + "//chrome/browser/resource_coordinator", "//chrome/browser/task_manager/common", "//chrome/browser/ui/bookmarks:unit_tests", "//chrome/browser/ui/extensions", "//chrome/browser/ui/extensions:unit_tests", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/safety_hub", "//chrome/browser/ui/search:test_support_ui", "//chrome/browser/ui/search:unit_tests", @@ -11560,6 +11564,7 @@ "//chrome/browser/commerce", "//chrome/browser/content_settings", "//chrome/browser/image_fetcher", + "//chrome/browser/resource_coordinator", "//chrome/browser/ui/actions:actions", "//chrome/browser/ui/commerce", "//chrome/browser/ui/commerce:test_support", @@ -11569,6 +11574,7 @@ "//chrome/browser/ui/hats:test_support", "//chrome/browser/ui/lens", "//chrome/browser/ui/media_router", + "//chrome/browser/ui/performance_controls", "//chrome/browser/ui/tabs", "//chrome/browser/ui/tabs:tab_group", "//chrome/browser/ui/tabs:tab_menu",
diff --git a/chrome/test/base/chrome_ash_test_base.cc b/chrome/test/base/chrome_ash_test_base.cc index 4aaf5d56..9a3fcd8a 100644 --- a/chrome/test/base/chrome_ash_test_base.cc +++ b/chrome/test/base/chrome_ash_test_base.cc
@@ -5,11 +5,18 @@ #include "chrome/test/base/chrome_ash_test_base.h" #include <memory> +#include <utility> +#include "chrome/test/base/testing_browser_process.h" #include "content/public/test/browser_task_environment.h" ChromeAshTestBase::ChromeAshTestBase() : ChromeAshTestBase(std::unique_ptr<base::test::TaskEnvironment>( std::make_unique<content::BrowserTaskEnvironment>())) {} +ChromeAshTestBase::ChromeAshTestBase( + std::unique_ptr<base::test::TaskEnvironment> task_environment) + : AshTestBase(std::move(task_environment), + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()) {} + ChromeAshTestBase::~ChromeAshTestBase() = default;
diff --git a/chrome/test/base/chrome_ash_test_base.h b/chrome/test/base/chrome_ash_test_base.h index d01a3ab..d348967 100644 --- a/chrome/test/base/chrome_ash_test_base.h +++ b/chrome/test/base/chrome_ash_test_base.h
@@ -5,6 +5,8 @@ #ifndef CHROME_TEST_BASE_CHROME_ASH_TEST_BASE_H_ #define CHROME_TEST_BASE_CHROME_ASH_TEST_BASE_H_ +#include <memory> + #include "ash/test/ash_test_base.h" // AshTestBase used in Chrome. @@ -13,9 +15,8 @@ class ChromeAshTestBase : public ash::AshTestBase { public: ChromeAshTestBase(); - ChromeAshTestBase( - std::unique_ptr<base::test::TaskEnvironment> task_environment) - : AshTestBase(std::move(task_environment)) {} + explicit ChromeAshTestBase( + std::unique_ptr<base::test::TaskEnvironment> task_environment); ChromeAshTestBase(const ChromeAshTestBase&) = delete; ChromeAshTestBase& operator=(const ChromeAshTestBase&) = delete;
diff --git a/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js b/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js index 5013978..784638f 100644 --- a/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js +++ b/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js
@@ -51,17 +51,24 @@ function getFontList() { var message = 'getFontList should return an array of objects with ' + 'fontId and displayName properties.'; + const getPlatformInfo = new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); fs.getFontList(chrome.test.callbackPass(function(value) { - if (/Android/.test(navigator.userAgent)) { - // Android does not support a mechanism to get "all installed fonts" - // like Windows/Mac/Linux. - chrome.test.assertTrue(value.length === 0, 'Font list should be empty'); - } else { - chrome.test.assertTrue(value.length > 0, - "Font list is not expected to be empty."); - chrome.test.assertEq('string', typeof (value[0].fontId), message); - chrome.test.assertEq('string', typeof (value[0].displayName), message); - } + getPlatformInfo.then(isAndroid => { + if (isAndroid) { + // Android does not support a mechanism to get "all installed fonts" + // like Windows/Mac/Linux. + chrome.test.assertTrue( + value.length === 0, 'Font list should be empty'); + } else { + chrome.test.assertTrue( + value.length > 0, 'Font list is not expected to be empty.'); + chrome.test.assertEq('string', typeof (value[0].fontId), message); + chrome.test.assertEq( + 'string', typeof (value[0].displayName), message); + } + }); })); },
diff --git a/chrome/test/data/extensions/api_test/font_settings/standard/test.js b/chrome/test/data/extensions/api_test/font_settings/standard/test.js index 06f6e6d..3f34f5a 100644 --- a/chrome/test/data/extensions/api_test/font_settings/standard/test.js +++ b/chrome/test/data/extensions/api_test/font_settings/standard/test.js
@@ -101,17 +101,24 @@ function getFontList() { var message = 'getFontList should return an array of objects with ' + 'fontId and displayName properties.'; + const getPlatformInfo = new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); fs.getFontList(chrome.test.callbackPass(function(value) { - if (/Android/.test(navigator.userAgent)) { - // Android does not support a mechanism to get "all installed fonts" - // like Windows/Mac/Linux. - chrome.test.assertTrue(value.length === 0, 'Font list should be empty'); - } else { - chrome.test.assertTrue(value.length > 0, - "Font list is not expected to be empty."); - chrome.test.assertEq('string', typeof (value[0].fontId), message); - chrome.test.assertEq('string', typeof (value[0].displayName), message); - } + getPlatformInfo.then(isAndroid => { + if (isAndroid) { + // Android does not support a mechanism to get "all installed fonts" + // like Windows/Mac/Linux. + chrome.test.assertTrue( + value.length === 0, 'Font list should be empty'); + } else { + chrome.test.assertTrue( + value.length > 0, 'Font list is not expected to be empty.'); + chrome.test.assertEq('string', typeof (value[0].fontId), message); + chrome.test.assertEq( + 'string', typeof (value[0].displayName), message); + } + }); })); },
diff --git a/chrome/test/data/extensions/api_test/i18n/test.js b/chrome/test/data/extensions/api_test/i18n/test.js index e412d5b..68fddff 100644 --- a/chrome/test/data/extensions/api_test/i18n/test.js +++ b/chrome/test/data/extensions/api_test/i18n/test.js
@@ -9,7 +9,6 @@ var callbackPass = chrome.test.callbackPass; chrome.test.getConfig(function(config) { - chrome.test.runTests([ function getAcceptLanguages() { chrome.i18n.getAcceptLanguages(callbackPass(function(results) { @@ -41,24 +40,27 @@ chrome.test.succeed(); }, function getMessageFromContentScript() { - // TODO(crbug.com/371432155): Port to desktop Android once the chrome.tabs - // API is supported. - if (/Android/.test(navigator.userAgent)) { - chrome.test.succeed(); - return; - } - var TEST_FILE_URL = "http://localhost:PORT/extensions/test_file.html" - .replace(/PORT/, config.testServer.port); - chrome.runtime.onMessage.addListener( - function(request, sender, sendResponse) { - chrome.test.assertEq(request, "Number of errors: 19"); - } - ); - chrome.test.log("Creating tab..."); - chrome.tabs.create({ - url: TEST_FILE_URL + // TODO(crbug.com/371432155): Port to desktop Android once the + // chrome.tabs API is supported. + const getPlatformInfo = new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); }); - chrome.test.succeed(); + getPlatformInfo.then(isAndroid => { + if (isAndroid) { + chrome.test.succeed(); + } else { + var TEST_FILE_URL = + 'http://localhost:PORT/extensions/test_file.html'.replace( + /PORT/, config.testServer.port); + chrome.runtime.onMessage.addListener(function( + request, sender, sendResponse) { + chrome.test.assertEq(request, 'Number of errors: 19'); + }); + chrome.test.log('Creating tab...'); + chrome.tabs.create({url: TEST_FILE_URL}); + chrome.test.succeed(); + } + }); }, function getUILanguage() { chrome.test.assertEq('en-US', chrome.i18n.getUILanguage());
diff --git a/chrome/test/data/extensions/api_test/instance_id/delete_token/delete_token.js b/chrome/test/data/extensions/api_test/instance_id/delete_token/delete_token.js index 2c5fd85..fe02f8c5 100644 --- a/chrome/test/data/extensions/api_test/instance_id/delete_token/delete_token.js +++ b/chrome/test/data/extensions/api_test/instance_id/delete_token/delete_token.js
@@ -86,25 +86,29 @@ } function deleteTokenBeforeGetToken() { - if (/Android/.test(navigator.userAgent)) { - // Skip this test on Android because the underlying call to - // com.google.android.gms.iid.InstanceID.deleteToken() always succeeds, - // even for non-existent tokens. - chrome.test.succeed("skipped"); - return; - } - chrome.instanceID.deleteToken( - {"authorizedEntity": "1", "scope": "GCM"}, - function() { - if (chrome.runtime.lastError) { - chrome.test.succeed(); - return; - } + const getPlatformInfo = new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); + getPlatformInfo.then(isAndroid => { + if (isAndroid) { + // Skip this test on Android because the underlying call to + // com.google.android.gms.iid.InstanceID.deleteToken() always succeeds, + // even for non-existent tokens. + chrome.test.succeed('skipped'); + return; + } else { + chrome.instanceID.deleteToken( + {'authorizedEntity': '1', 'scope': 'GCM'}, function() { + if (chrome.runtime.lastError) { + chrome.test.succeed(); + return; + } - chrome.test.fail( - "deleteToken should fail on deleting a non-existent token."); + chrome.test.fail( + 'deleteToken should fail on deleting a non-existent token.'); + }); } - ); + }); } function deleteTokenAfterGetToken() {
diff --git a/chrome/test/data/extensions/api_test/offscreen/basic_document_management/background.js b/chrome/test/data/extensions/api_test/offscreen/basic_document_management/background.js index 9cf2457..4e0575e 100644 --- a/chrome/test/data/extensions/api_test/offscreen/basic_document_management/background.js +++ b/chrome/test/data/extensions/api_test/offscreen/basic_document_management/background.js
@@ -29,11 +29,16 @@ // TODO(crbug.com/378916068): Enable the test on desktop android. async function createDocumentAndEnsureItExistsAndThenClose() { // Skip this test on Android, which does not yet support messaging. - if (/Android/.test(navigator.userAgent)) { - chrome.test.succeed(); - return; + const isAndroid = await new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); + if (isAndroid) { + // Skip this test on Android because the underlying call to + // com.google.android.gms.iid.InstanceID.deleteToken() always succeeds, + // even for non-existent tokens. + chrome.test.succeed('skipped'); + return; } - chrome.test.assertFalse(await hasOffscreenDocument()); await chrome.offscreen.createDocument(VALID_PARAMS);
diff --git a/chrome/test/data/extensions/api_test/permissions/add_host_access_request/worker.js b/chrome/test/data/extensions/api_test/permissions/add_host_access_request/worker.js index eb7aaa9..f9a49c87 100644 --- a/chrome/test/data/extensions/api_test/permissions/add_host_access_request/worker.js +++ b/chrome/test/data/extensions/api_test/permissions/add_host_access_request/worker.js
@@ -62,7 +62,10 @@ async function accessAlreadyGrantedForTabId() { // TODO(crbug.com/371432155): Port to desktop Android when chrome.tabs API // is available. - if (/Android/.test(navigator.userAgent)) { + const isAndroid = await new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); + if (isAndroid) { chrome.test.succeed(); return; }
diff --git a/chrome/test/data/extensions/api_test/permissions/remove_host_access_request/worker.js b/chrome/test/data/extensions/api_test/permissions/remove_host_access_request/worker.js index 3d1d463..a5d84f14 100644 --- a/chrome/test/data/extensions/api_test/permissions/remove_host_access_request/worker.js +++ b/chrome/test/data/extensions/api_test/permissions/remove_host_access_request/worker.js
@@ -62,7 +62,10 @@ async function nonExistentRequest() { // TODO(crbug.com/371432155): Port to desktop Android when chrome.tabs API // is available. - if (/Android/.test(navigator.userAgent)) { + const isAndroid = await new Promise((resolve) => { + chrome.runtime.getPlatformInfo(info => resolve(info.os == 'android')); + }); + if (isAndroid) { chrome.test.succeed(); return; }
diff --git a/chrome/test/data/web_apps/empty_web_app.json b/chrome/test/data/web_apps/empty_web_app.json index 9b6f6b7..58b94d0 100644 --- a/chrome/test/data/web_apps/empty_web_app.json +++ b/chrome/test/data/web_apps/empty_web_app.json
@@ -17,6 +17,7 @@ "disallowed_launch_protocols": [ ], "display_mode": "", "display_override": [ ], + "diy_app_icons_masked_on_mac": false, "downloaded_icon_sizes": { "ANY": [ ], "MASKABLE": [ ], @@ -28,7 +29,6 @@ "generated_icon_fix": null, "install_state": "2", "is_diy_app": false, - "diy_app_icons_masked_on_mac": false, "is_from_sync_and_pending_installation": false, "is_generated_icon": false, "is_uninstalling": false, @@ -48,6 +48,7 @@ "manifest_url": "", "note_taking_new_note_url": "", "parent_app_id": null, + "pending_update_info": null, "protocol_handlers": [ ], "related_applications": [ ], "run_on_os_login_mode": "not run",
diff --git a/chrome/test/data/web_apps/sample_web_app.json b/chrome/test/data/web_apps/sample_web_app.json index 543526b..6da629d 100644 --- a/chrome/test/data/web_apps/sample_web_app.json +++ b/chrome/test/data/web_apps/sample_web_app.json
@@ -237,6 +237,27 @@ "manifest_url": "https://example.com/manifest1234.json", "note_taking_new_note_url": "https://example.com/scope1234/new_note3011162902", "parent_app_id": "463354209", + "pending_update_info": { + "manifest_icons": [ { + "icon_purpose": 2, + "icon_square_size_px": 48, + "url": "https://example.com/icon2572177745" + }, { + "icon_purpose": 2, + "icon_square_size_px": 192, + "url": "https://example.com/icon3502924369" + }, { + "icon_purpose": 3, + "icon_square_size_px": 192, + "url": "https://example.com/icon476349338" + }, { + "icon_purpose": 3, + "icon_square_size_px": 256, + "url": "https://example.com/icon3978233549" + } ], + "name": "Name1234", + "short_name": "random_short_name_1234" + }, "permissions_policy": [ { "allowed_origins": [ "https://app-15481569330.com" ], "feature": "accelerometer",
diff --git a/chrome/test/data/webui/side_panel/read_anything/BUILD.gn b/chrome/test/data/webui/side_panel/read_anything/BUILD.gn index d9435e05..844b2f4 100644 --- a/chrome/test/data/webui/side_panel/read_anything/BUILD.gn +++ b/chrome/test/data/webui/side_panel/read_anything/BUILD.gn
@@ -13,6 +13,7 @@ "app_style_updater_test.ts", "checkmark_visible_on_selected_test.ts", "color_menu_test.ts", + "connected_callback_test.ts", "common.ts", "common_test.ts", "download_notification_test.ts",
diff --git a/chrome/test/data/webui/side_panel/read_anything/connected_callback_test.ts b/chrome/test/data/webui/side_panel/read_anything/connected_callback_test.ts index a1434a0..46aa343a6 100644 --- a/chrome/test/data/webui/side_panel/read_anything/connected_callback_test.ts +++ b/chrome/test/data/webui/side_panel/read_anything/connected_callback_test.ts
@@ -6,6 +6,7 @@ import {BrowserProxy} from '//resources/cr_components/color_change_listener/browser_proxy.js'; import type {AppElement} from 'chrome-untrusted://read-anything-side-panel.top-chrome/read_anything.js'; +import {SpeechController} from 'chrome-untrusted://read-anything-side-panel.top-chrome/read_anything.js'; import {assertEquals, assertStringContains} from 'chrome-untrusted://webui-test/chai_assert.js'; import {createApp} from './common.js'; @@ -14,6 +15,15 @@ suite('ConnectedCallback', () => { let app: AppElement; + const speechController = new class extends SpeechController { + scrollCount: number = 0; + + override onScroll() { + this.scrollCount++; + } + } + (); + setup(async () => { // Clearing the DOM should always be done first. @@ -22,18 +32,32 @@ const readingMode = new FakeReadingMode(); chrome.readingMode = readingMode as unknown as typeof chrome.readingMode; + SpeechController.setInstance(speechController); + app = await createApp(); app.connectedCallback(); }); test('shows loading page', () => { assertEquals( - app.querySelector<HTMLElement>('#empty-state-container')!.hidden, + app.shadowRoot.querySelector<HTMLElement>( + '#empty-state-container')!.hidden, false); - const emptyState = app.querySelector('sp-empty-state')!; + const emptyState = app.shadowRoot.querySelector('sp-empty-state')!; assertEquals('Getting ready', emptyState.heading); assertEquals('', emptyState.body); assertStringContains(emptyState.imagePath, 'throbber'); assertStringContains(emptyState.darkImagePath, 'throbber'); }); + + test('scroll listener added', () => { + assertEquals(0, speechController.scrollCount); + + // Scroll events are received by containerScroller. + app.$.containerScroller.dispatchEvent(new Event('scroll')); + assertEquals(1, speechController.scrollCount); + + app.$.containerScroller.dispatchEvent(new Event('scroll')); + assertEquals(2, speechController.scrollCount); + }); });
diff --git a/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc b/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc index baf315b..e8a586ff 100644 --- a/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc +++ b/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc
@@ -300,6 +300,11 @@ "mocha.run()"); } +IN_PROC_BROWSER_TEST_F(ReadAnythingMochaTest, ConnectedCallback) { + RunSidePanelTest("side_panel/read_anything/connected_callback_test.js", + "mocha.run()"); +} + class ReadAnythingReadAloudPhraseHighlightingMochaTest : public ReadAnythingMochaBrowserTest { protected:
diff --git a/chrome/updater/util/win_util.cc b/chrome/updater/util/win_util.cc index d1722138..893abd4 100644 --- a/chrome/updater/util/win_util.cc +++ b/chrome/updater/util/win_util.cc
@@ -42,6 +42,7 @@ #include "base/process/process.h" #include "base/process/process_iterator.h" #include "base/scoped_native_library.h" +#include "base/strings/cstring_view.h" #include "base/strings/strcat.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -1555,7 +1556,7 @@ (service_config->dwStartType != SERVICE_DISABLED); } -void LogComCaller(const std::string& caller_func) { +void LogComCaller(base::cstring_view caller_func) { Microsoft::WRL::ComPtr<ICallingProcessInfo> calling_proc_info; HRESULT hr = ::CoGetCallContext(IID_PPV_ARGS(&calling_proc_info)); if (FAILED(hr)) {
diff --git a/chrome/updater/util/win_util.h b/chrome/updater/util/win_util.h index 2ad43ba..7f1027b9 100644 --- a/chrome/updater/util/win_util.h +++ b/chrome/updater/util/win_util.h
@@ -30,6 +30,7 @@ #include "base/logging.h" #include "base/process/process_iterator.h" #include "base/scoped_generic.h" +#include "base/strings/cstring_view.h" #include "base/time/time.h" #include "base/types/expected.h" #include "base/version.h" @@ -473,7 +474,7 @@ [[nodiscard]] bool IsServiceEnabled(const std::wstring& service_name); // Logs the COM client PID when called from a COM server. -void LogComCaller(const std::string& caller_func); +void LogComCaller(base::cstring_view caller_func); } // namespace updater
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 499c4ab..31934de 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -16336.0.0-1069958 \ No newline at end of file +16336.0.0-1069966 \ No newline at end of file
diff --git a/chromeos/ash/components/hid_detection/BUILD.gn b/chromeos/ash/components/hid_detection/BUILD.gn index 3ff0ee9..4d29673e 100644 --- a/chromeos/ash/components/hid_detection/BUILD.gn +++ b/chromeos/ash/components/hid_detection/BUILD.gn
@@ -64,6 +64,7 @@ "//chromeos/ash/services/bluetooth_config", "//chromeos/ash/services/bluetooth_config:test_support", "//chromeos/ash/services/bluetooth_config/public/mojom", + "//components/session_manager/core", "//device/bluetooth:mocks", "//mojo/public/cpp/bindings", "//services/device/public/cpp/hid:hid",
diff --git a/chromeos/ash/components/hid_detection/DEPS b/chromeos/ash/components/hid_detection/DEPS index 3593794..93faf4d 100644 --- a/chromeos/ash/components/hid_detection/DEPS +++ b/chromeos/ash/components/hid_detection/DEPS
@@ -10,5 +10,6 @@ ".*unittest\\.cc": [ # Allows fake implementations. "+chromeos/ash/services/bluetooth_config", + "+components/session_manager/core/session_manager.h", ] }
diff --git a/chromeos/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc b/chromeos/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc index 266f6170..2189ed9 100644 --- a/chromeos/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc +++ b/chromeos/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc
@@ -21,6 +21,7 @@ #include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h" #include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "components/session_manager/core/session_manager.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash::hid_detection { @@ -272,6 +273,8 @@ base::test::ScopedFeatureList scoped_feature_list_; base::HistogramTester histogram_tester_; + session_manager::SessionManager session_manager_; + std::vector<BluetoothDevicePropertiesPtr> unpaired_devices_; size_t num_devices_created_ = 0u;
diff --git a/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h index 21b4075..bc84ebe 100644 --- a/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h +++ b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h
@@ -8,8 +8,6 @@ #include "base/memory/raw_ptr.h" #include "chromeos/ash/services/bluetooth_config/initializer.h" -#include "components/session_manager/core/session_manager.h" - namespace ash::bluetooth_config { class FakeAdapterStateController; @@ -63,10 +61,6 @@ return fake_device_operation_handler_; } - session_manager::SessionManager* session_manager() { - return &session_manager_; - } - private: // Initializer: std::unique_ptr<AdapterStateController> CreateAdapterStateController( @@ -111,7 +105,6 @@ fake_discovery_session_manager_; raw_ptr<FakeDeviceOperationHandler, DanglingUntriaged> fake_device_operation_handler_; - session_manager::SessionManager session_manager_; }; } // namespace ash::bluetooth_config
diff --git a/clank b/clank index 8cc7534..a4036a4 160000 --- a/clank +++ b/clank
@@ -1 +1 @@ -Subproject commit 8cc75345a767e49de7d72d7b41de8febeceda0ed +Subproject commit a4036a451c6b207002395694d73d786c0ca27bee
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.cc b/components/autofill/core/browser/payments/credit_card_access_manager.cc index 5393cb1f..ce1eaac 100644 --- a/components/autofill/core/browser/payments/credit_card_access_manager.cc +++ b/components/autofill/core/browser/payments/credit_card_access_manager.cc
@@ -274,9 +274,7 @@ autofill_metrics::LogCardInfoRetrievalEnrolledUnmaskResult( CardInfoRetrievalEnrolledUnmaskResult::kAuthenticationUnmasked); } - autofill_client().GetFormDataImporter()->set_card_was_fetched_from_cache( - false); - std::move(on_credit_card_fetched_callback_).Run(*card_); + OnCreditCardFetched(*card_, /*card_was_fetched_from_cache=*/false); } void CreditCardAccessManager::OnDidGetUnmaskDetails( @@ -344,6 +342,7 @@ // Get the card's record type to correctly handle its fetching. CreditCard::RecordType record_type = card->record_type(); + on_credit_card_fetched_callback_ = std::move(on_credit_card_fetched); // Log the server card unmasking attempt, and differentiate based on server // card or virtual card. @@ -377,24 +376,17 @@ unmasked_card_cache_.find(GetKeyForUnmaskedCardsCache(*card)); if (it != unmasked_card_cache_.end()) { // key is in cache it->second.card.set_cvc(it->second.cvc); - std::move(on_credit_card_fetched).Run(/*credit_card=*/it->second.card); + OnCreditCardFetched(it->second.card, /*card_was_fetched_from_cache=*/true); autofill_metrics::LogServerCardUnmaskResult( ServerCardUnmaskResult::kLocalCacheHit, record_type, ServerCardUnmaskFlowType::kUnspecified); - // If the card is fetched from the in-memory cache, notify the - // FormDataImporter. - autofill_client().GetFormDataImporter()->set_card_was_fetched_from_cache( - true); - Reset(); return; } card_ = std::make_unique<CreditCard>(*card); - on_credit_card_fetched_callback_ = std::move(on_credit_card_fetched); - switch (record_type) { case CreditCard::RecordType::kVirtualCard: return FetchVirtualCard(); @@ -759,7 +751,7 @@ if (ShouldRespondImmediately(response)) { DCHECK(!should_register_card_with_fido); if (response.did_succeed) { - std::move(on_credit_card_fetched_callback_).Run(*card_); + OnCreditCardFetched(*card_, /*card_was_fetched_from_cache=*/false); } unmask_auth_flow_type_ = UnmaskAuthFlowType::kNone; } else if (should_register_card_with_fido) { @@ -898,7 +890,7 @@ void CreditCardAccessManager::OnFidoAuthorizationComplete(bool did_succeed) { if (did_succeed) { - std::move(on_credit_card_fetched_callback_).Run(*card_); + OnCreditCardFetched(*card_, /*card_was_fetched_from_cache=*/false); form_event_logger_->LogCardUnmaskAuthenticationPromptCompleted( unmask_auth_flow_type_); } @@ -1315,7 +1307,7 @@ } // Fill immediately if local card, as we do not need to authenticate the // user. - std::move(on_credit_card_fetched_callback_).Run(*card_); + OnCreditCardFetched(*card_, /*card_was_fetched_from_cache=*/false); // This local card autofill flow did not have any interactive // authentication, so notify the FormDataImporter of this. @@ -1445,7 +1437,7 @@ payments_autofill_client().CloseAutofillProgressDialog( /*show_confirmation_before_closing=*/true, /*no_interactive_authentication_callback=*/base::OnceClosure()); - std::move(on_credit_card_fetched_callback_).Run(*card_); + OnCreditCardFetched(*card_, /*card_was_fetched_from_cache=*/false); // If the server returned a successful response along with the card's // real PAN without requiring interactive authentication, set the @@ -1679,7 +1671,7 @@ card->record_type()), authentication_method, autofill_metrics::MandatoryReauthAuthenticationFlowEvent::kFlowSkipped); - std::move(on_credit_card_fetched_callback_).Run(*card); + OnCreditCardFetched(*card, /*card_was_fetched_from_cache=*/false); return; } @@ -1739,7 +1731,7 @@ record_type, ServerCardUnmaskFlowType::kDeviceUnlock); if (successful_auth) { - std::move(on_credit_card_fetched_callback_).Run(*card); + OnCreditCardFetched(*card, /*card_was_fetched_from_cache=*/false); } // `on_credit_card_fetched_callback_` makes a copy of `card` and `cvc` before // it asynchronously fills them into the form. Thus we can safely call @@ -1753,7 +1745,8 @@ if (response.result == payments::PaymentsWindowManager::Vcn3dsAuthenticationResult::kSuccess) { CHECK(response.card.has_value()); - std::move(on_credit_card_fetched_callback_).Run(response.card.value()); + OnCreditCardFetched(response.card.value(), + /*card_was_fetched_from_cache=*/false); autofill_metrics::LogServerCardUnmaskResult( ServerCardUnmaskResult::kAuthenticationUnmasked, PaymentsRpcCardType::kVirtualCard, @@ -1772,4 +1765,12 @@ Reset(); } +void CreditCardAccessManager::OnCreditCardFetched( + const CreditCard& card, + bool card_was_fetched_from_cache) { + autofill_client().GetFormDataImporter()->set_card_was_fetched_from_cache( + card_was_fetched_from_cache); + std::move(on_credit_card_fetched_callback_).Run(card); +} + } // namespace autofill
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.h b/components/autofill/core/browser/payments/credit_card_access_manager.h index 0da3b33..91cc193e 100644 --- a/components/autofill/core/browser/payments/credit_card_access_manager.h +++ b/components/autofill/core/browser/payments/credit_card_access_manager.h
@@ -371,6 +371,10 @@ void OnVcn3dsAuthenticationComplete( payments::PaymentsWindowManager::Vcn3dsAuthenticationResponse response); + // Invoked when the card is successfully fetched. + void OnCreditCardFetched(const CreditCard& card, + bool card_was_fetched_from_cache); + // The current form of authentication in progress. UnmaskAuthFlowType unmask_auth_flow_type_ = UnmaskAuthFlowType::kNone;
diff --git a/components/autofill/core/common/autofill_payments_features.cc b/components/autofill/core/common/autofill_payments_features.cc index 38f43bf..480fc092 100644 --- a/components/autofill/core/common/autofill_payments_features.cc +++ b/components/autofill/core/common/autofill_payments_features.cc
@@ -53,6 +53,12 @@ "AutofillEnableBuyNowPayLater", base::FEATURE_DISABLED_BY_DEFAULT); +// When enabled, buy now pay later (BNPL) for externally linked Klarna in +// Autofill will be offered. +BASE_FEATURE(kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarna, + "AutofillEnableBuyNowPayLaterForExternallyLinkedKlarna", + base::FEATURE_DISABLED_BY_DEFAULT); + // When enabled, buy now pay later (BNPL) for Klarna in Autofill will be // offered. BASE_FEATURE(kAutofillEnableBuyNowPayLaterForKlarna,
diff --git a/components/autofill/core/common/autofill_payments_features.h b/components/autofill/core/common/autofill_payments_features.h index 0920474..3486b46 100644 --- a/components/autofill/core/common/autofill_payments_features.h +++ b/components/autofill/core/common/autofill_payments_features.h
@@ -30,6 +30,8 @@ COMPONENT_EXPORT(AUTOFILL) BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLater); COMPONENT_EXPORT(AUTOFILL) +BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterForExternallyLinkedKlarna); +COMPONENT_EXPORT(AUTOFILL) BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterForKlarna); COMPONENT_EXPORT(AUTOFILL) BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterSyncing);
diff --git a/components/collaboration/internal/collaboration_service_impl.cc b/components/collaboration/internal/collaboration_service_impl.cc index 3903ff85..b7fbf74 100644 --- a/components/collaboration/internal/collaboration_service_impl.cc +++ b/components/collaboration/internal/collaboration_service_impl.cc
@@ -474,13 +474,6 @@ return CollaborationStatus::kDisabledForPolicy; } - // Disable for automotive users. - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_AUTOMOTIVE && - !base::FeatureList::IsEnabled( - data_sharing::features::kCollaborationAutomotive)) { - return CollaborationStatus::kDisabled; - } - // TODO(haileywang): Support collaboration status updates. CollaborationStatus status = CollaborationStatus::kDisabled; if (base::FeatureList::IsEnabled(
diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc index 19aa68b..5e9e910 100644 --- a/components/commerce/core/commerce_feature_list.cc +++ b/components/commerce/core/commerce_feature_list.cc
@@ -40,22 +40,27 @@ static const base::NoDestructor<CountryLocaleMap> allowed_map([] { CountryLocaleMap map; - map[&kCommerceMerchantViewerRegionLaunched] = {{"us", {"en-us"}}}; - map[&kEnableDiscountInfoApiRegionLaunched] = {{"us", {"en-us"}}}; +#if BUILDFLAG(IS_ANDROID) + map[&kCommerceMerchantViewer] = {{"us", {"en-us"}}}; + map[&kPriceAnnotations] = {{"us", {"en-us"}}}; +#endif // BUILDFLAG(IS_ANDROID) + +#if !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_ANDROID) + map[&kEnableDiscountInfoApi] = {{"us", {"en-us"}}}; +#endif // !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_ANDROID) + map[&ntp_features::kNtpChromeCartModule] = {{"us", {"en-us"}}}; - map[&kPriceAnnotationsRegionLaunched] = {{"us", {"en-us"}}}; - map[&kPriceInsightsRegionLaunched] = {{"us", {"en-us"}}}; - map[&kProductSpecifications] = {{"us", {"en-us"}}}; + map[&kPriceInsights] = {{"us", {"en-us"}}}; + map[&kProductSpecifications] = {}; map[&kShoppingList] = {{"us", {"en-us"}}}; - map[&kShoppingPageTypesRegionLaunched] = {{"us", {"en-us"}}}; - map[&kShoppingPDPMetricsRegionLaunched] = {{"us", {"en-us"}}}; - map[&kSubscriptionsApiRegionLaunched] = { - {"us", {"en", "en-gb", "en-us"}}, - {"au", {"en", "en-au", "en-gb", "en-us"}}, - {"ca", {"en", "en-ca", "en-gb", "en-us"}}, - {"in", {"en", "en-gb", "en-in", "en-us"}}, - {"jp", {"ja", "ja-jp"}}}; - map[&kDiscountAutofillRegionLaunched] = {{"us", {"en-us"}}}; + map[&kShoppingPageTypes] = {{"us", {"en-us"}}}; + map[&kShoppingPDPMetrics] = {{"us", {"en-us"}}}; + map[&kSubscriptionsApi] = {{"us", {"en", "en-gb", "en-us"}}, + {"au", {"en", "en-au", "en-gb", "en-us"}}, + {"ca", {"en", "en-ca", "en-gb", "en-us"}}, + {"in", {"en", "en-gb", "en-in", "en-us"}}, + {"jp", {"ja", "ja-jp"}}}; + map[&kDiscountAutofill] = {}; return map; }()); @@ -125,15 +130,6 @@ BASE_FEATURE(kCommerceMerchantViewer, "CommerceMerchantViewer", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_ANDROID) -BASE_FEATURE(kCommerceMerchantViewerRegionLaunched, - "CommerceMerchantViewerRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -#else -BASE_FEATURE(kCommerceMerchantViewerRegionLaunched, - "CommerceMerchantViewerRegionLaunched", - base::FEATURE_DISABLED_BY_DEFAULT); -#endif // BUILDFLAG(IS_ANDROID) BASE_FEATURE(kCommerceLocalPDPDetection, "CommerceLocalPDPDetection", @@ -143,29 +139,10 @@ "PriceAnnotations", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_ANDROID) -BASE_FEATURE(kPriceAnnotationsRegionLaunched, - "PriceAnnotationsRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -#else -BASE_FEATURE(kPriceAnnotationsRegionLaunched, - "PriceAnnotationsRegionLaunched", - base::FEATURE_DISABLED_BY_DEFAULT); -#endif // BUILDFLAG(IS_ANDROID) - BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) -BASE_FEATURE(kPriceInsightsRegionLaunched, - "PriceInsightsRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -#else -BASE_FEATURE(kPriceInsightsRegionLaunched, - "PriceInsightsRegionLaunched", - base::FEATURE_DISABLED_BY_DEFAULT); -#endif + const char kPriceInsightsDelayChipParam[] = "price-inishgts-delay-chip"; const base::FeatureParam<bool> kPriceInsightsDelayChip{ &commerce::kPriceInsights, kPriceInsightsDelayChipParam, false}; @@ -185,9 +162,6 @@ BASE_FEATURE(kDiscountAutofill, "DiscountAutofill", base::FEATURE_DISABLED_BY_DEFAULT); -BASE_FEATURE(kDiscountAutofillRegionLaunched, - "DiscountAutofillRegionLaunched", - base::FEATURE_DISABLED_BY_DEFAULT); // Promotion in Magic Stack for Price Tracking users from other platforms. BASE_FEATURE(kPriceTrackingPromo, @@ -243,17 +217,6 @@ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false}; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) -BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, - "EnableDiscountInfoApiRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -#else -BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, - "EnableDiscountInfoApiRegionLaunched", - base::FEATURE_DISABLED_BY_DEFAULT); -#endif - const char kHistoryClustersBehaviorParam[] = "history-cluster-behavior"; const char kMerchantWideBehaviorParam[] = "merchant-wide-behavior"; const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; @@ -312,21 +275,10 @@ "ShoppingPDPMetrics", base::FEATURE_DISABLED_BY_DEFAULT); -BASE_FEATURE(kShoppingPDPMetricsRegionLaunched, - "ShoppingPDPMetricsRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); - -BASE_DECLARE_FEATURE(kSubscriptionsApi); -BASE_DECLARE_FEATURE(kSubscriptionsApiRegionLaunched); - BASE_FEATURE(kSubscriptionsApi, "SubscriptionsApi", base::FEATURE_DISABLED_BY_DEFAULT); -BASE_FEATURE(kSubscriptionsApiRegionLaunched, - "SubscriptionsApiRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kTrackByDefaultOnMobile, "TrackByDefaultOnMobile", base::FEATURE_DISABLED_BY_DEFAULT); @@ -345,10 +297,6 @@ "ShoppingPageTypes", base::FEATURE_DISABLED_BY_DEFAULT); -BASE_FEATURE(kShoppingPageTypesRegionLaunched, - "ShoppingPageTypesRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kRetailCoupons, "RetailCoupons", base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCommerceDeveloper, @@ -477,18 +425,6 @@ return flag_enabled || region_launched; } -bool IsRegionLockedFeatureEnabled(const base::Feature& feature, - const base::Feature& feature_region_launched, - const std::string& country_code, - const std::string& locale) { - bool flag_enabled = base::FeatureList::IsEnabled(feature); - bool region_launched = - base::FeatureList::IsEnabled(feature_region_launched) && - IsEnabledForCountryAndLocale(feature_region_launched, country_code, - locale); - return flag_enabled || region_launched; -} - #if !BUILDFLAG(IS_ANDROID) base::TimeDelta GetDiscountFetchDelay() { auto delay_from_component =
diff --git a/components/commerce/core/commerce_feature_list.h b/components/commerce/core/commerce_feature_list.h index 22594315..9871a17 100644 --- a/components/commerce/core/commerce_feature_list.h +++ b/components/commerce/core/commerce_feature_list.h
@@ -24,15 +24,12 @@ BASE_DECLARE_FEATURE(kCommerceAllowOnDemandBookmarkUpdates); BASE_DECLARE_FEATURE(kCommerceLocalPDPDetection); BASE_DECLARE_FEATURE(kCommerceMerchantViewer); -BASE_DECLARE_FEATURE(kCommerceMerchantViewerRegionLaunched); extern const base::FeatureParam<bool> kDeleteAllMerchantsOnClearBrowsingHistory; BASE_DECLARE_FEATURE(kPriceAnnotations); -BASE_DECLARE_FEATURE(kPriceAnnotationsRegionLaunched); // Feature flag for Price Insights. BASE_DECLARE_FEATURE(kPriceInsights); -BASE_DECLARE_FEATURE(kPriceInsightsRegionLaunched); extern const char kPriceInsightsDelayChipParam[]; extern const base::FeatureParam<bool> kPriceInsightsDelayChip; extern const char kPriceInsightsChipLabelExpandOnHighPriceParam[]; @@ -56,15 +53,11 @@ BASE_DECLARE_FEATURE(kPriceTrackingSubscriptionServiceLocaleKey); BASE_DECLARE_FEATURE(kPriceTrackingSubscriptionServiceProductVersion); BASE_DECLARE_FEATURE(kShoppingPageTypes); -BASE_DECLARE_FEATURE(kShoppingPageTypesRegionLaunched); BASE_DECLARE_FEATURE(kShoppingPDPMetrics); -BASE_DECLARE_FEATURE(kShoppingPDPMetricsRegionLaunched); BASE_DECLARE_FEATURE(kSubscriptionsApi); -BASE_DECLARE_FEATURE(kSubscriptionsApiRegionLaunched); BASE_DECLARE_FEATURE(kTrackByDefaultOnMobile); // Feature flag for showing discounts on checkout autofill. BASE_DECLARE_FEATURE(kDiscountAutofill); -BASE_DECLARE_FEATURE(kDiscountAutofillRegionLaunched); BASE_DECLARE_FEATURE(kShoppingAlternateServer); @@ -81,7 +74,6 @@ kNoAutoPopup = 2 }; BASE_DECLARE_FEATURE(kEnableDiscountInfoApi); -BASE_DECLARE_FEATURE(kEnableDiscountInfoApiRegionLaunched); BASE_DECLARE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting); BASE_DECLARE_FEATURE(kDiscountDialogAutoPopupCounterfactual); extern const char kHistoryClustersBehaviorParam[]; @@ -231,12 +223,6 @@ const std::string& country_code, const std::string& locale); -// DEPRECATED: Use the above function for new features. -bool IsRegionLockedFeatureEnabled(const base::Feature& feature, - const base::Feature& feature_region_launched, - const std::string& country_code, - const std::string& locale); - #if !BUILDFLAG(IS_ANDROID) // Get the time delay between discount fetches. base::TimeDelta GetDiscountFetchDelay();
diff --git a/components/commerce/core/commerce_feature_list_unittest.cc b/components/commerce/core/commerce_feature_list_unittest.cc index 1d9ef7c..727ff0a9b 100644 --- a/components/commerce/core/commerce_feature_list_unittest.cc +++ b/components/commerce/core/commerce_feature_list_unittest.cc
@@ -156,23 +156,29 @@ // This test assumes that, at bare minimum, "US" is an allowed country and // "en-us" is an allowed locale for the US. TEST_F(CommerceFeatureListTest, TestEnabledForCountryAndLocale) { + base::test::ScopedFeatureList scoped_features; + + // Specifically init with no flags so that the feature is not in an + // "overridden" state. + scoped_features.InitWithEmptyFeatureAndFieldTrialLists(); + // Check the known success cases with different character cases. ASSERT_TRUE(commerce::IsEnabledForCountryAndLocale( - commerce::kShoppingPDPMetricsRegionLaunched, "US", "en-us")); + commerce::kShoppingPDPMetrics, "US", "en-us")); ASSERT_TRUE(commerce::IsEnabledForCountryAndLocale( - commerce::kShoppingPDPMetricsRegionLaunched, "us", "en-US")); + commerce::kShoppingPDPMetrics, "us", "en-US")); // Test allowed country with disallowed (fake) locale. ASSERT_FALSE(commerce::IsEnabledForCountryAndLocale( - commerce::kShoppingPDPMetricsRegionLaunched, "us", "zz-zz")); + commerce::kShoppingPDPMetrics, "us", "zz-zz")); // Test allowed locale in a disallowed (fake) country. ASSERT_FALSE(commerce::IsEnabledForCountryAndLocale( - commerce::kShoppingPDPMetricsRegionLaunched, "zz", "en-us")); + commerce::kShoppingPDPMetrics, "zz", "en-us")); // Ensure empty values don't crash. ASSERT_FALSE(commerce::IsEnabledForCountryAndLocale( - commerce::kShoppingPDPMetricsRegionLaunched, "", "")); + commerce::kShoppingPDPMetrics, "", "")); } TEST_F(CommerceFeatureListTest, IsShoppingListEnabled) {
diff --git a/components/commerce/core/feature_utils.cc b/components/commerce/core/feature_utils.cc index c5ec31e3..3c9d0f0 100644 --- a/components/commerce/core/feature_utils.cc +++ b/components/commerce/core/feature_utils.cc
@@ -59,10 +59,9 @@ } bool IsPriceInsightsApiEnabled(AccountChecker* account_checker) { - return account_checker && - commerce::IsRegionLockedFeatureEnabled( - kPriceInsights, kPriceInsightsRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + return account_checker && commerce::IsRegionLockedFeatureEnabled( + kPriceInsights, account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsPriceInsightsEligible(AccountChecker* account_checker) { @@ -71,16 +70,16 @@ } bool IsSubscriptionsApiEnabled(AccountChecker* account_checker) { - return IsRegionLockedFeatureEnabled( - kSubscriptionsApi, kSubscriptionsApiRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + return IsRegionLockedFeatureEnabled(kSubscriptionsApi, + account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsPriceAnnotationsEnabled(AccountChecker* account_checker) { return account_checker && - commerce::IsRegionLockedFeatureEnabled( - kPriceAnnotations, kPriceAnnotationsRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + commerce::IsRegionLockedFeatureEnabled(kPriceAnnotations, + account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsProductSpecificationsAllowedForEnterprise(PrefService* prefs) { @@ -167,9 +166,9 @@ bool IsDiscountInfoApiEnabled(AccountChecker* account_checker) { return account_checker && - commerce::IsRegionLockedFeatureEnabled( - kEnableDiscountInfoApi, kEnableDiscountInfoApiRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + commerce::IsRegionLockedFeatureEnabled(kEnableDiscountInfoApi, + account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsDiscountEligibleToShowOnNavigation(AccountChecker* account_checker) { @@ -180,23 +179,23 @@ bool IsMerchantViewerEnabled(AccountChecker* account_checker) { return account_checker && - commerce::IsRegionLockedFeatureEnabled( - kCommerceMerchantViewer, kCommerceMerchantViewerRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + commerce::IsRegionLockedFeatureEnabled(kCommerceMerchantViewer, + account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsShoppingPageTypesApiEnabled(AccountChecker* account_checker) { return account_checker && - commerce::IsRegionLockedFeatureEnabled( - kShoppingPageTypes, kShoppingPageTypesRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + commerce::IsRegionLockedFeatureEnabled(kShoppingPageTypes, + account_checker->GetCountry(), + account_checker->GetLocale()); } bool IsDiscountAutofillEnabled(AccountChecker* account_checker) { return account_checker && account_checker->IsSignedIn() && account_checker->IsAnonymizedUrlDataCollectionEnabled() && - commerce::IsRegionLockedFeatureEnabled( - kDiscountAutofill, kDiscountAutofillRegionLaunched, - account_checker->GetCountry(), account_checker->GetLocale()); + commerce::IsRegionLockedFeatureEnabled(kDiscountAutofill, + account_checker->GetCountry(), + account_checker->GetLocale()); } } // namespace commerce
diff --git a/components/commerce/core/pdp_metrics_unittest.cc b/components/commerce/core/pdp_metrics_unittest.cc index bef5d07..55c1046 100644 --- a/components/commerce/core/pdp_metrics_unittest.cc +++ b/components/commerce/core/pdp_metrics_unittest.cc
@@ -40,8 +40,7 @@ // Test that PDP metrics for the page are recorded. TEST_F(PDPMetricsTest, TestPDPIsRecorded) { - test_features_.InitWithFeatures({kShoppingPDPMetrics}, - {kShoppingPDPMetricsRegionLaunched}); + test_features_.InitWithFeatures({kShoppingPDPMetrics}, {}); std::string url = "http://example.com"; @@ -67,8 +66,7 @@ // Test that PDP metrics for the page are not recorded if none of the flags that // allow it are enabled. TEST_F(PDPMetricsTest, TestNoFlags_NotRecorded) { - test_features_.InitWithFeatures( - {}, {kShoppingPDPMetrics, kShoppingPDPMetricsRegionLaunched}); + test_features_.InitWithFeatures({}, {kShoppingPDPMetrics}); std::string url = "http://example.com"; @@ -89,8 +87,7 @@ // Test that PDP metrics for an incognito page are not recorded. TEST_F(PDPMetricsTest, TestIncognitoPDPIsNotRecorded) { - test_features_.InitWithFeatures({kShoppingPDPMetrics}, - {kShoppingPDPMetricsRegionLaunched}); + test_features_.InitWithFeatures({kShoppingPDPMetrics}, {}); std::string url = "http://example.com"; @@ -115,8 +112,7 @@ // Test that a page that isn't considered a PDP is recorded. TEST_F(PDPMetricsTest, TestFalseOptGuideResponseIsRecorded) { - test_features_.InitWithFeatures({kShoppingPDPMetrics}, - {kShoppingPDPMetricsRegionLaunched}); + test_features_.InitWithFeatures({kShoppingPDPMetrics}, {}); std::string url = "http://example.com";
diff --git a/components/commerce/core/shopping_service.cc b/components/commerce/core/shopping_service.cc index 76838f9..54927bf4 100644 --- a/components/commerce/core/shopping_service.cc +++ b/components/commerce/core/shopping_service.cc
@@ -628,8 +628,7 @@ optimization_guide::OptimizationGuideDecision decision, const optimization_guide::OptimizationMetadata& metadata, const GURL& url) { - if (!IsRegionLockedFeatureEnabled(kShoppingPDPMetrics, - kShoppingPDPMetricsRegionLaunched)) { + if (!IsRegionLockedFeatureEnabled(kShoppingPDPMetrics)) { return; } @@ -1005,14 +1004,6 @@ } bool ShoppingService::IsRegionLockedFeatureEnabled( - const base::Feature& feature, - const base::Feature& region_specific_feature) { - return commerce::IsRegionLockedFeatureEnabled( - feature, region_specific_feature, country_on_startup_, - locale_on_startup_); -} - -bool ShoppingService::IsRegionLockedFeatureEnabled( const base::Feature& feature) { return commerce::IsRegionLockedFeatureEnabled(feature, country_on_startup_, locale_on_startup_);
diff --git a/components/commerce/core/shopping_service.h b/components/commerce/core/shopping_service.h index 6c1af21..b903845d 100644 --- a/components/commerce/core/shopping_service.h +++ b/components/commerce/core/shopping_service.h
@@ -363,11 +363,6 @@ // determined by this service at startup. bool IsRegionLockedFeatureEnabled(const base::Feature& feature); - // DEPRECATED: Use the above method for new features. - bool IsRegionLockedFeatureEnabled( - const base::Feature& feature, - const base::Feature& region_specific_feature); - // This is a feature check for the "shopping list". This will only return true // if the user has the feature flag enabled, is signed-in, has MSBB enabled, // has webapp activity enabled, is allowed by enterprise policy, and (if
diff --git a/components/data_sharing/public/features.cc b/components/data_sharing/public/features.cc index 0614796c..514df97 100644 --- a/components/data_sharing/public/features.cc +++ b/components/data_sharing/public/features.cc
@@ -20,10 +20,6 @@ } // namespace -BASE_FEATURE(kCollaborationAutomotive, - "CollaborationAutomotive", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kCollaborationEntrepriseV2, "CollaborationEntrepriseV2", base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/components/data_sharing/public/features.h b/components/data_sharing/public/features.h index 3f75d3b..f7d43ac 100644 --- a/components/data_sharing/public/features.h +++ b/components/data_sharing/public/features.h
@@ -11,9 +11,6 @@ namespace data_sharing::features { -// Feature flag for enabling collaboration on automotive. -BASE_DECLARE_FEATURE(kCollaborationAutomotive); - // Feature flag for enabling collaboration in entreprise v2. BASE_DECLARE_FEATURE(kCollaborationEntrepriseV2);
diff --git a/components/dom_distiller/content/browser/android/BUILD.gn b/components/dom_distiller/content/browser/android/BUILD.gn index f997198..e7e71c1 100644 --- a/components/dom_distiller/content/browser/android/BUILD.gn +++ b/components/dom_distiller/content/browser/android/BUILD.gn
@@ -10,6 +10,7 @@ "//build/android:build_java", "//components/dom_distiller/core/android:dom_distiller_core_java", "//content/public/android:content_java", + "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", ]
diff --git a/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DEPS b/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DEPS index ad8365b..491f452 100644 --- a/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DEPS +++ b/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DEPS
@@ -1,4 +1,6 @@ include_rules = [ - "-content/public/android/java", + "+components/dom_distiller", "+content/public/android/java/src/org/chromium/content_public", + + "-content/public/android/java", ]
diff --git a/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java b/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java index a029e99..e00fbb8 100644 --- a/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java +++ b/components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java
@@ -4,6 +4,8 @@ package org.chromium.components.dom_distiller.content; +import androidx.annotation.VisibleForTesting; + import org.jni_zero.CalledByNative; import org.jni_zero.JNINamespace; import org.jni_zero.NativeMethods; @@ -50,7 +52,8 @@ } @NativeMethods - interface Natives { + @VisibleForTesting + public interface Natives { void setDelegate(WebContents webContents, PageDistillableDelegate delegate); } }
diff --git a/components/facilitated_payments/core/features/features.cc b/components/facilitated_payments/core/features/features.cc index f09a6712..30fc55f7 100644 --- a/components/facilitated_payments/core/features/features.cc +++ b/components/facilitated_payments/core/features/features.cc
@@ -43,7 +43,7 @@ // detected. Users can choose the payment app they want to // use and be redirected to the chosen app to complete the payment flow. BASE_FEATURE(kFacilitatedPaymentsEnableA2APayment, - "kFacilitatedPaymentsEnableA2APayment", + "FacilitatedPaymentsEnableA2APayment", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_ANDROID)
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc index 190f31e..46a96ff 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -9,6 +9,7 @@ #include <algorithm> #include <cstddef> +#include <functional> #include <map> #include <memory> #include <numeric> @@ -1620,6 +1621,7 @@ UpdateTailSuggestPrefix(&internal_result_); MaybeRemoveCompanyEntityImages(&internal_result_); MaybeCleanSuggestionsForKeywordMode(input_, &internal_result_); + MaybeCleanIphSuggestions(&internal_result_); // Notify providers which of their matches were shown. If we end up with more // providers to notify, we should add `RegisterDisplayedMatches()` to the @@ -1706,7 +1708,7 @@ // Attach the contextual search fulfillment actions in the @page keyword // mode. if (keyword_turl && keyword_turl->starter_pack_id() == - template_url_starter_pack_data::kPage) { + template_url_starter_pack_data::kPage) { internal_result_.AttachContextualSearchFulfillmentActionToMatches(); return; } @@ -2799,3 +2801,15 @@ } } } + +void AutocompleteController::MaybeCleanIphSuggestions( + AutocompleteResult* result) { + bool has_toolbelt = std::ranges::any_of(result->begin(), result->end(), + &AutocompleteMatch::IsToolbelt); + if (has_toolbelt) { + result->EraseMatchesWhere([](const auto& match) { + return match.IsIphSuggestion() && + match.iph_type != IphType::kHistoryEmbeddingsDisclaimer; + }); + } +}
diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h index cd3d880..d428a6a 100644 --- a/components/omnibox/browser/autocomplete_controller.h +++ b/components/omnibox/browser/autocomplete_controller.h
@@ -530,6 +530,10 @@ void MaybeCleanSuggestionsForKeywordMode(const AutocompleteInput& input, AutocompleteResult* result); + // Removes promotional IPH suggestions if `result` contains toolbelt. Does not + // remove disclaimer IPHs. + void MaybeCleanIphSuggestions(AutocompleteResult* result); + // Get the experiment stats v2 entry for the omnibox position. Used on iOS. const omnibox::metrics::ChromeSearchboxStats::ExperimentStatsV2 GetOmniboxPositionExperimentStatsV2() const;
diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc index d44b399..869721bc 100644 --- a/components/omnibox/browser/autocomplete_match.cc +++ b/components/omnibox/browser/autocomplete_match.cc
@@ -1625,7 +1625,7 @@ return 8; } - if (IsIPHSuggestion()) { + if (IsIphSuggestion()) { return 9; } @@ -1728,7 +1728,7 @@ return subtypes.contains(/*omnibox::SUBTYPE_TRENDS=*/143); } -bool AutocompleteMatch::IsIPHSuggestion() const { +bool AutocompleteMatch::IsIphSuggestion() const { return iph_type != IphType::kNone; }
diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h index c2f584a..6e609773 100644 --- a/components/omnibox/browser/autocomplete_match.h +++ b/components/omnibox/browser/autocomplete_match.h
@@ -534,7 +534,7 @@ // Checks if this match is an informational IPH suggestion based on the match // and provider type. - bool IsIPHSuggestion() const; + bool IsIphSuggestion() const; // Checks if this match has an attached action with the given `action_id`. bool HasAction(OmniboxActionId action_id) const;
diff --git a/components/omnibox/browser/autocomplete_match_unittest.cc b/components/omnibox/browser/autocomplete_match_unittest.cc index 7803fb8..0759e38 100644 --- a/components/omnibox/browser/autocomplete_match_unittest.cc +++ b/components/omnibox/browser/autocomplete_match_unittest.cc
@@ -1126,7 +1126,7 @@ } else if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL || match.type == AutocompleteMatchType::HISTORY_EMBEDDINGS_ANSWER || (match.type == AutocompleteMatchType::NULL_RESULT_MESSAGE && - !match.IsIPHSuggestion())) { + !match.IsIphSuggestion())) { // SEARCH_SUGGEST_TAIL and non-IPH NULL_RESULT_MESSAGE suggestions use an // empty vector icon. EXPECT_TRUE(match.GetVectorIcon(/*is_bookmark=*/false).is_empty());
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc index 8313e30e..bf16e2e 100644 --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc
@@ -456,8 +456,8 @@ } else if (omnibox::IsNTPPage(page_classification)) { // IPH is shown for NTP ZPS in the Omnibox only. If it is shown, reduce // the limit of the normal NTP ZPS Section to make room for the IPH. - bool has_iph_match = std::ranges::any_of( - matches_, [](auto match) { return match.IsIPHSuggestion(); }); + bool has_iph_match = + std::ranges::any_of(matches_, &AutocompleteMatch::IsIphSuggestion); bool add_iph_section = page_classification != OmniboxEventProto::NTP_REALBOX && has_iph_match;
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc index c7f7e1d..e7b1a22b 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -1930,6 +1930,10 @@ switch (popup_selection_.state) { case OmniboxPopupSelection::NORMAL: { int available_actions_count = 0; + if (line + 1 < autocomplete_controller()->result().size() && + autocomplete_controller()->result().match_at(line + 1).IsToolbelt()) { + additional_message_id = IDS_ACC_OMNIBOX_TOOLBELT_NEXT_SUFFIX; + } if (OmniboxPopupSelection(line, OmniboxPopupSelection::KEYWORD_MODE) .IsControlPresentOnMatch(autocomplete_controller()->result(), GetPrefService())) { @@ -2007,7 +2011,7 @@ additional_message_id = IDS_ACC_THUMBS_DOWN_SUGGESTION_FOCUSED_PREFIX; break; case OmniboxPopupSelection::FOCUSED_BUTTON_REMOVE_SUGGESTION: - additional_message_id = match.IsIPHSuggestion() + additional_message_id = match.IsIphSuggestion() ? IDS_ACC_DISMISS_CHROME_TIP_FOCUSED_PREFIX : IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX; break; @@ -2052,7 +2056,7 @@ if (next_line < autocomplete_controller()->result().size()) { const AutocompleteMatch& next_match = autocomplete_controller()->result().match_at(next_line); - if (next_match.IsIPHSuggestion()) { + if (next_match.IsIphSuggestion()) { label = l10n_util::GetStringFUTF16(IDS_ACC_CHROME_TIP, next_match.contents);
diff --git a/components/omnibox/browser/omnibox_popup_selection.cc b/components/omnibox/browser/omnibox_popup_selection.cc index 9605051..2ed0847 100644 --- a/components/omnibox/browser/omnibox_popup_selection.cc +++ b/components/omnibox/browser/omnibox_popup_selection.cc
@@ -54,7 +54,7 @@ case FOCUSED_BUTTON_REMOVE_SUGGESTION: return match.SupportsDeletion(); case FOCUSED_IPH_LINK: - return match.IsIPHSuggestion() && !match.iph_link_url.is_empty(); + return match.IsIphSuggestion() && !match.iph_link_url.is_empty(); default: break; }
diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index 634e1fc5..252c4c94 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp
@@ -558,6 +558,10 @@ Chrome Tip link, press Enter to open <ph name="IPH_LINK_FOCUSED_LINK_TEXT">$1<ex>Learn more</ex></ph> </message> + <message name="IDS_ACC_OMNIBOX_TOOLBELT_NEXT_SUFFIX" desc="Additional text announcement when a match preceding the toolbelt is selected."> + <ph name="TOOLBELT_PRECEDING_MATCH_TEXT">$1<ex>The Chromium Projects http://www.chromium.org bookmark</ex></ph>, Press tab for more search shortcuts available after this search suggestion + </message> + <message name="IDS_OMNIBOX_HISTORY_SCOPE_PROMO_IPH" desc="The string displayed as the last row in the Omnibox as IPH encouraging users to try the @history scope."> Type @history to search your browsing history </message>
diff --git a/components/omnibox_strings_grdp/IDS_ACC_OMNIBOX_TOOLBELT_NEXT_SUFFIX.png.sha1 b/components/omnibox_strings_grdp/IDS_ACC_OMNIBOX_TOOLBELT_NEXT_SUFFIX.png.sha1 new file mode 100644 index 0000000..5ad99e49 --- /dev/null +++ b/components/omnibox_strings_grdp/IDS_ACC_OMNIBOX_TOOLBELT_NEXT_SUFFIX.png.sha1
@@ -0,0 +1 @@ +020487cea5fb85938a274693a5c971ad9a6ca2c6 \ No newline at end of file
diff --git a/components/optimization_guide/internal b/components/optimization_guide/internal index 767cec7..c97b15a 160000 --- a/components/optimization_guide/internal +++ b/components/optimization_guide/internal
@@ -1 +1 @@ -Subproject commit 767cec7806b9fe51a9bc9500ed9b4bd0e37dcb0e +Subproject commit c97b15a7f3d4f2e4c490bbce6f8b1703edab1a38
diff --git a/components/performance_manager/binders.cc b/components/performance_manager/binders.cc index 3333895..0782878f 100644 --- a/components/performance_manager/binders.cc +++ b/components/performance_manager/binders.cc
@@ -100,14 +100,13 @@ void Binders::ExposeInterfacesToBrowserChildProcess( mojo::BinderMapWithContext<content::BrowserChildProcessHost*>* map) { - map->Add<mojom::ChildProcessCoordinationUnit>(base::BindRepeating( - &BindChildProcessCoordinationUnitForBrowserChildProcessHost)); + map->Add<mojom::ChildProcessCoordinationUnit>( + &BindChildProcessCoordinationUnitForBrowserChildProcessHost); } void Binders::ExposeInterfacesToRenderFrame( mojo::BinderMapWithContext<content::RenderFrameHost*>* map) { - map->Add<mojom::DocumentCoordinationUnit>( - base::BindRepeating(&BindDocumentCoordinationUnit)); + map->Add<mojom::DocumentCoordinationUnit>(&BindDocumentCoordinationUnit); } } // namespace performance_manager
diff --git a/components/policy/core/common/cloud/dmserver_job_configurations.h b/components/policy/core/common/cloud/dmserver_job_configurations.h index ed1ffff..50db5ee 100644 --- a/components/policy/core/common/cloud/dmserver_job_configurations.h +++ b/components/policy/core/common/cloud/dmserver_job_configurations.h
@@ -15,7 +15,6 @@ #include "components/policy/core/common/cloud/device_management_service.h" #include "components/policy/core/common/cloud/dm_auth.h" #include "components/policy/policy_export.h" -#include "components/policy/proto/cloud_policy.pb.h" #include "components/policy/proto/device_management_backend.pb.h" #include "url/gurl.h"
diff --git a/components/saved_tab_groups/internal/saved_tab_group_model.cc b/components/saved_tab_groups/internal/saved_tab_group_model.cc index cdffd1d..b302dcf 100644 --- a/components/saved_tab_groups/internal/saved_tab_group_model.cc +++ b/components/saved_tab_groups/internal/saved_tab_group_model.cc
@@ -16,6 +16,7 @@ #include "base/metrics/user_metrics_action.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/uuid.h" #include "components/saved_tab_groups/internal/saved_tab_group_model_observer.h" #include "components/saved_tab_groups/internal/stats.h" @@ -382,18 +383,21 @@ // Make a copy before moving the `tab`. const base::Uuid tab_guid_copy = tab.saved_tab_guid(); + + if (notify_observers) { + // This is a locally generated navigation event. Update the navigation + // timestamp of the SavedTabGroupTab since we will not get the tab + // modification time back from sync in the standard way due to reflection + // blocking. + tab.SetNavigationTime(base::Time::Now()); + } + group->UpdateTab(std::move(tab)); if (!notify_observers) { return; } - // This is a locally generated navigation event. Update the navigation - // timestamp of the SavedTabGroupTab since we will not get the tab - // modification time back from sync in the standard way due to reflection - // blocking. - tab.SetNavigationTime(base::Time::Now()); - // Since the group has at least one synced tab now, start syncing any pending // NTP. StartSyncingPendingNtpIfAny(*group); @@ -520,10 +524,10 @@ } } -void SavedTabGroupModel::UpdateTabLastSeenTime(const base::Uuid& group_id, - const base::Uuid& tab_id, - base::Time time, - TriggerSource source) { +void SavedTabGroupModel::UpdateTabLastSeenTimeFromSync( + const base::Uuid& group_id, + const base::Uuid& tab_id, + base::Time time) { SavedTabGroup* group = GetMutableGroup(group_id); CHECK(group); @@ -534,26 +538,43 @@ SavedTabGroupTab* tab = group->GetTab(tab_id); CHECK(tab); - // If the new time is not more recent than the one in the model, - // ignore it. This data is managed by the account data sync bridge, - // which always prefers the more recent time. - const std::optional<base::Time>& current_model_time = tab->last_seen_time(); - if (current_model_time.has_value() && current_model_time.value() >= time) { - return; - } - - // Optimization: If the tab is already seen, we don't need to update the - // timestamp again (e.g. due to a tab selection event locally) which will save - // a redundant update to sync. - if (source == TriggerSource::LOCAL && tab->last_seen_time().has_value() && - tab->last_seen_time() >= tab->navigation_time()) { + // Only accept the incoming last seen time from sync if it is newer than what + // we have locally. + if (tab->last_seen_time().has_value() && + tab->last_seen_time().value() >= time) { return; } tab->SetLastSeenTime(time); for (SavedTabGroupModelObserver& observer : observers_) { - observer.SavedTabGroupTabLastSeenTimeUpdated(tab_id, source); + observer.SavedTabGroupTabLastSeenTimeUpdated(tab_id, TriggerSource::REMOTE); + } +} + +void SavedTabGroupModel::UpdateTabLastSeenTimeFromLocal( + const base::Uuid& group_id, + const base::Uuid& tab_id) { + SavedTabGroup* group = GetMutableGroup(group_id); + CHECK(group); + + if (!group->is_shared_tab_group()) { + return; + } + + SavedTabGroupTab* tab = group->GetTab(tab_id); + CHECK(tab); + + // Only update the last seen time if the navigation time of the tab is newer. + if (tab->last_seen_time().has_value() && + tab->last_seen_time() >= tab->navigation_time()) { + return; + } + + tab->SetLastSeenTime(tab->navigation_time()); + + for (SavedTabGroupModelObserver& observer : observers_) { + observer.SavedTabGroupTabLastSeenTimeUpdated(tab_id, TriggerSource::LOCAL); } }
diff --git a/components/saved_tab_groups/internal/saved_tab_group_model.h b/components/saved_tab_groups/internal/saved_tab_group_model.h index 37bc3a37..07a0a8b1 100644 --- a/components/saved_tab_groups/internal/saved_tab_group_model.h +++ b/components/saved_tab_groups/internal/saved_tab_group_model.h
@@ -201,11 +201,12 @@ void UpdateLastUserInteractionTimeLocally( const LocalTabGroupID& local_group_id); - // Update the last time a tab was seen. - void UpdateTabLastSeenTime(const base::Uuid& group_id, - const base::Uuid& tab_id, - base::Time time, - TriggerSource source); + // Update the last seen time for a tab. + void UpdateTabLastSeenTimeFromLocal(const base::Uuid& group_id, + const base::Uuid& tab_id); + void UpdateTabLastSeenTimeFromSync(const base::Uuid& group_id, + const base::Uuid& tab_id, + base::Time time); // Update the position for a share group from sync. If the position is // nullopt, the group will be moved to the end of the list.
diff --git a/components/saved_tab_groups/internal/saved_tab_group_model_unittest.cc b/components/saved_tab_groups/internal/saved_tab_group_model_unittest.cc index 0995997..659a007 100644 --- a/components/saved_tab_groups/internal/saved_tab_group_model_unittest.cc +++ b/components/saved_tab_groups/internal/saved_tab_group_model_unittest.cc
@@ -13,6 +13,7 @@ #include "base/rand_util.h" #include "base/test/gtest_util.h" #include "base/test/scoped_feature_list.h" +#include "base/test/task_environment.h" #include "base/token.h" #include "base/uuid.h" #include "build/build_config.h" @@ -140,7 +141,10 @@ class SavedTabGroupModelTest : public ::testing::Test { protected: SavedTabGroupModelTest() - : id_1_(base::Uuid::GenerateRandomV4()), + : task_environment_( + base::test::SingleThreadTaskEnvironment::MainThreadType::UI, + base::test::TaskEnvironment::TimeSource::SYSTEM_TIME), + id_1_(base::Uuid::GenerateRandomV4()), id_2_(base::Uuid::GenerateRandomV4()), id_3_(base::Uuid::GenerateRandomV4()) {} @@ -210,6 +214,11 @@ return saved_tab_group_ids; } + const SavedTabGroupTab& GetTab(const base::Uuid& group_id, int index) { + return saved_tab_group_model_->Get(group_id)->saved_tabs()[index]; + } + + base::test::SingleThreadTaskEnvironment task_environment_; std::unique_ptr<SavedTabGroupModel> saved_tab_group_model_; std::string base_path_ = "file:///c:/tmp/"; base::Uuid id_1_; @@ -971,61 +980,54 @@ } } -TEST_F(SavedTabGroupModelTest, SetsLastSeenTime) { +TEST_F(SavedTabGroupModelTest, UpdateTabLastSeenTimeFromLocal) { + // Start test with no navigation time and no seen time set. SavedTabGroup saved_group = test::CreateTestSavedTabGroup(); saved_group.SetCollaborationId(tab_groups::CollaborationId("collab_id")); saved_tab_group_model_->AddedLocally(saved_group); const base::Uuid group_id = saved_group.saved_guid(); - EXPECT_FALSE(saved_tab_group_model_->Get(group_id) - ->saved_tabs() - .front() - .last_seen_time() - .has_value()); + ASSERT_FALSE(GetTab(group_id, 0).last_seen_time().has_value()); - base::Time last_seen_time = base::Time::Now(); - saved_tab_group_model_->UpdateTabLastSeenTime( - saved_group.saved_guid(), - saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time, - TriggerSource::LOCAL); + base::Time nav_time1 = GetTab(group_id, 0).navigation_time(); + ASSERT_EQ(base::Time(), nav_time1); - EXPECT_TRUE(saved_tab_group_model_->Get(group_id) - ->saved_tabs() - .front() - .last_seen_time() - .has_value()); - EXPECT_EQ(last_seen_time, saved_tab_group_model_->Get(group_id) - ->saved_tabs() - .front() - .last_seen_time()); - - // Update the last seen time again. But since it's already greater than - // navigaion time, the redundant update will be ignored. - base::Time last_seen_time2 = base::Time::Now() + base::Seconds(10); - saved_tab_group_model_->UpdateTabLastSeenTime( - saved_group.saved_guid(), - saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time2, - TriggerSource::LOCAL); - EXPECT_EQ(last_seen_time, saved_tab_group_model_->Get(group_id) - ->saved_tabs() - .front() - .last_seen_time()); + // Navigate the tab, thereby updating navigation time. Try updating last seen + // time after that (e.g. focusing the tab). It should succeed and update the + // last seen time. SavedTabGroupTab tab = saved_tab_group_model_->Get(group_id)->saved_tabs().front(); + saved_tab_group_model_->UpdateTabInGroup(group_id, tab, + /*notify_observers=*/true); + base::Time nav_time2 = GetTab(group_id, 0).navigation_time(); + ASSERT_NE(nav_time1, nav_time2); + + saved_tab_group_model_->UpdateTabLastSeenTimeFromLocal( + saved_group.saved_guid(), + saved_group.saved_tabs().front().saved_tab_guid()); + + EXPECT_TRUE(GetTab(group_id, 0).last_seen_time().has_value()); + EXPECT_EQ(nav_time2, GetTab(group_id, 0).last_seen_time()); + + // Update the last seen time from local again (e.g. focusing the tab). But + // since the navigation time didn't change, the redundant update will be + // ignored. + saved_tab_group_model_->UpdateTabLastSeenTimeFromLocal( + saved_group.saved_guid(), + saved_group.saved_tabs().front().saved_tab_guid()); + EXPECT_EQ(nav_time2, GetTab(group_id, 0).last_seen_time()); // Update navigation time and try updating last seen time again. It should // succeed. - tab.SetNavigationTime(base::Time::Now() + base::Seconds(5)); saved_tab_group_model_->UpdateTabInGroup(group_id, tab, /*notify_observers=*/true); - saved_tab_group_model_->UpdateTabLastSeenTime( + base::Time nav_time3 = GetTab(group_id, 0).navigation_time(); + ASSERT_NE(nav_time2, nav_time3); + saved_tab_group_model_->UpdateTabLastSeenTimeFromLocal( saved_group.saved_guid(), - saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time2, - TriggerSource::LOCAL); - EXPECT_EQ(last_seen_time2, saved_tab_group_model_->Get(group_id) - ->saved_tabs() - .front() - .last_seen_time()); + saved_group.saved_tabs().front().saved_tab_guid()); + + EXPECT_EQ(nav_time3, GetTab(group_id, 0).last_seen_time()); } // Tests that SavedTabGroupModelObserver::Added passes the correct element from @@ -1375,8 +1377,7 @@ UnorderedElementsAre(HasGroupId(shared_group.saved_guid()))); } -TEST_F(SavedTabGroupModelObserverTest, - TriggersObserverWhenSettingTabLastSeenTime) { +TEST_F(SavedTabGroupModelObserverTest, UpdateTabLastSeenTimeFromSync) { SavedTabGroup saved_group = test::CreateTestSavedTabGroup(); saved_group.SetCollaborationId(tab_groups::CollaborationId("collab_id")); saved_tab_group_model_->AddedLocally(saved_group); @@ -1389,10 +1390,9 @@ .has_value()); base::Time last_seen_time = base::Time::Now(); - saved_tab_group_model_->UpdateTabLastSeenTime( + saved_tab_group_model_->UpdateTabLastSeenTimeFromSync( saved_group.saved_guid(), - saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time, - TriggerSource::LOCAL); + saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time); // Observer method was called. EXPECT_EQ(last_seen_tab_id_, saved_tab_group_model_->Get(group_id) @@ -1408,6 +1408,17 @@ ->saved_tabs() .front() .last_seen_time()); + + // Mimic receiving a seen time from sync older than what the tab currently + // has. It should be ignored. + base::Time last_seen_time2 = last_seen_time - base::Seconds(5); + saved_tab_group_model_->UpdateTabLastSeenTimeFromSync( + saved_group.saved_guid(), + saved_group.saved_tabs().front().saved_tab_guid(), last_seen_time2); + EXPECT_EQ(last_seen_time, saved_tab_group_model_->Get(group_id) + ->saved_tabs() + .front() + .last_seen_time()); } TEST_F(SavedTabGroupModelTest, UpdatePositionForSharedGroupFromSyncFromSync) {
diff --git a/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge.cc b/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge.cc index 26fed28..833fffd 100644 --- a/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge.cc +++ b/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge.cc
@@ -643,11 +643,10 @@ return; } - model_->UpdateTabLastSeenTime( + model_->UpdateTabLastSeenTimeFromSync( group_id, tab_id, DeserializeTime( - specifics.shared_tab_details().last_seen_timestamp_windows_epoch()), - TriggerSource::REMOTE); + specifics.shared_tab_details().last_seen_timestamp_windows_epoch())); storage_keys_for_missing_tabs_.erase(storage_key); }
diff --git a/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge_unittest.cc b/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge_unittest.cc index 5020a36..d8c89b0 100644 --- a/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge_unittest.cc +++ b/components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge_unittest.cc
@@ -753,14 +753,12 @@ // Update the last seen timestamp for tab1 locally. The updated timestamp // should be sent to sync. - base::Time last_seen_time3 = base::Time::Now() + base::Seconds(55); base::Time last_seen_time4 = base::Time::Now() + base::Seconds(99); syncer::EntityData entity_data; EXPECT_CALL(mock_processor(), Put(Eq(storage_key1), _, _)) .WillOnce(SaveArgPointeeMove<1>(&entity_data)); - model().UpdateTabLastSeenTime(group_id, tab_id1, last_seen_time3, - TriggerSource::LOCAL); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id1); // Verify the written specifics. const sync_pb::SharedTabGroupAccountDataSpecifics& specifics = @@ -771,21 +769,20 @@ EXPECT_TRUE(specifics.has_shared_tab_details()); EXPECT_EQ(group_id.AsLowercaseString(), specifics.shared_tab_details().shared_tab_group_guid()); - EXPECT_EQ(last_seen_time3.ToDeltaSinceWindowsEpoch().InMicroseconds(), + EXPECT_EQ(tab1->navigation_time().ToDeltaSinceWindowsEpoch().InMicroseconds(), specifics.shared_tab_details().last_seen_timestamp_windows_epoch()); // Update the last seen timestamp for tab2 from sync. The updated timestamp // should not be sent back to sync. EXPECT_CALL(mock_processor(), Put(Eq(storage_key2), _, _)).Times(0); - model().UpdateTabLastSeenTime(group_id, tab_id2, last_seen_time4, - TriggerSource::REMOTE); + model().UpdateTabLastSeenTimeFromSync(group_id, tab_id2, last_seen_time4); - ASSERT_EQ(tab1->last_seen_time(), last_seen_time3); + ASSERT_EQ(tab1->last_seen_time(), tab1->navigation_time()); EXPECT_EQ(GetNumTabDetailsInStore(), 2u); auto specifics1 = bridge().GetSpecificsForStorageKey(storage_key1); EXPECT_TRUE(specifics1.has_value()); EXPECT_EQ( - last_seen_time3.ToDeltaSinceWindowsEpoch().InMicroseconds(), + tab1->last_seen_time()->ToDeltaSinceWindowsEpoch().InMicroseconds(), specifics1->shared_tab_details().last_seen_timestamp_windows_epoch()); ASSERT_EQ(tab2->last_seen_time(), last_seen_time4); @@ -859,13 +856,10 @@ // Update the last seen timestamp for tab1 locally. The updated timestamp // should be sent to sync. - base::Time last_seen_time3 = base::Time::Now() + base::Seconds(55); - syncer::EntityData entity_data; EXPECT_CALL(mock_processor(), Put(Eq(storage_key1), _, _)) .WillOnce(SaveArgPointeeMove<1>(&entity_data)); - model().UpdateTabLastSeenTime(group_id, tab_id1, last_seen_time3, - TriggerSource::LOCAL); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id1); // Verify the written specifics. const sync_pb::SharedTabGroupAccountDataSpecifics& specifics = @@ -918,10 +912,8 @@ // should be sent to sync. EXPECT_CALL(mock_processor(), Put(Eq(storage_key1), _, _)).Times(1); EXPECT_CALL(mock_processor(), Put(Eq(storage_key2), _, _)).Times(1); - model().UpdateTabLastSeenTime(group_id, tab_id1, base::Time::Now(), - TriggerSource::LOCAL); - model().UpdateTabLastSeenTime(group_id, tab_id2, base::Time::Now(), - TriggerSource::LOCAL); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id1); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id2); EXPECT_EQ(GetNumTabDetailsInStore(), 2u); // Delete the tab group locally. The corresponding sync entries for both tabs @@ -963,10 +955,8 @@ // should be sent to sync. EXPECT_CALL(mock_processor(), Put(Eq(storage_key1), _, _)).Times(1); EXPECT_CALL(mock_processor(), Put(Eq(storage_key2), _, _)).Times(1); - model().UpdateTabLastSeenTime(group_id, tab_id1, base::Time::Now(), - TriggerSource::LOCAL); - model().UpdateTabLastSeenTime(group_id, tab_id2, base::Time::Now(), - TriggerSource::LOCAL); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id1); + model().UpdateTabLastSeenTimeFromLocal(group_id, tab_id2); EXPECT_EQ(GetNumTabDetailsInStore(), 2u); // Delete the tab group from sync. The corresponding sync entries for both
diff --git a/components/saved_tab_groups/internal/tab_group_sync_service_impl.cc b/components/saved_tab_groups/internal/tab_group_sync_service_impl.cc index 0423827f..86e28b1 100644 --- a/components/saved_tab_groups/internal/tab_group_sync_service_impl.cc +++ b/components/saved_tab_groups/internal/tab_group_sync_service_impl.cc
@@ -661,8 +661,8 @@ UpdateAttributions(*group_id); model_->UpdateLastUserInteractionTimeLocally(*group_id); if (group->is_shared_tab_group()) { - model_->UpdateTabLastSeenTime(group->saved_guid(), tab->saved_tab_guid(), - base::Time::Now(), TriggerSource::LOCAL); + model_->UpdateTabLastSeenTimeFromLocal(group->saved_guid(), + tab->saved_tab_guid()); } LogEvent(TabGroupEvent::kTabSelected, *group_id, tab_id); } @@ -1150,7 +1150,7 @@ return; } - model_->UpdateTabLastSeenTime(group_id, tab_id, base::Time::Now(), source); + model_->UpdateTabLastSeenTimeFromLocal(group_id, tab_id); } TabGroupSyncMetricsLogger* @@ -1359,8 +1359,8 @@ for (const LocalTabID& local_tab_id : GetSelectedTabs()) { const SavedTabGroupTab* tab = group->GetTab(local_tab_id); if (tab) { - model_->UpdateTabLastSeenTime(group->saved_guid(), tab->saved_tab_guid(), - base::Time::Now(), TriggerSource::LOCAL); + model_->UpdateTabLastSeenTimeFromLocal(group->saved_guid(), + tab->saved_tab_guid()); } } }
diff --git a/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc b/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc index 409ad44..97ca123 100644 --- a/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc +++ b/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc
@@ -316,6 +316,7 @@ SavedTabGroupTab group_1_tab_1 = test::CreateSavedTabGroupTab( "A_Link", u"Only Tab", id_1, /*position=*/0); group_1_tab_1.SetLocalTabID(local_tab_id_1_); + group_1_tab_1.SetNavigationTime(base::Time::Now() + base::Days(1)); std::vector<SavedTabGroupTab> group_1_tabs = {group_1_tab_1}; std::vector<SavedTabGroupTab> group_2_tabs = { test::CreateSavedTabGroupTab("One_Link", u"One Of Two", id_2, @@ -950,6 +951,7 @@ EXPECT_TRUE(tab); VerifyCacheGuids(*group, tab, kTestCacheGuid, kTestCacheGuid, kTestCacheGuid, std::nullopt); + EXPECT_EQ(base::Time(), tab->navigation_time()); // Update tab and verify observers. std::u16string new_title = u"tab title 2"; @@ -975,6 +977,8 @@ kTestCacheGuid); histogram_tester.ExpectTotalCount( "TabGroups.Sync.TabGroup.TabNavigated.GroupCreateOrigin", 1u); + base::Time nav_time = tab->navigation_time(); + EXPECT_NE(base::Time(), nav_time); // Update redirect chain. This should not notify observers. SavedTabGroupTabBuilder tab_builder2; @@ -986,6 +990,8 @@ .Times(0); tab_group_sync_service_->UpdateTabProperties(local_group_id_1_, local_tab_id_2, tab_builder2); + base::Time nav_time2 = tab->navigation_time(); + EXPECT_EQ(nav_time, nav_time2); WaitForPostedTasks(); } @@ -1357,18 +1363,14 @@ TEST_F(TabGroupSyncServiceTest, OnTabSelected) { MakeTabGroupShared(local_group_id_1_, kCollaborationId); base::HistogramTester histogram_tester; - base::Time test_start_time = base::Time::Now(); // Advance the clock, so when a tab is selected, it will get a more // recent time than `test_start_time`. - task_environment_.AdvanceClock(base::Seconds(5)); + task_environment_.AdvanceClock(base::Days(50000)); // Add a new tab. - auto local_tab_id_2 = test::GenerateRandomTabID(); - std::u16string tab_title_2 = u"random tab title"; - tab_group_sync_service_->AddTab(local_group_id_1_, local_tab_id_2, - tab_title_2, GURL("www.google.com"), - std::nullopt); + tab_group_sync_service_->NavigateTab(local_group_id_1_, local_tab_id_1_, + GURL("https://foo.com"), u"title2"); { std::optional<SavedTabGroup> group = @@ -1376,26 +1378,27 @@ CHECK(group); // Local Tab 2 should start with no last_seen time. - EXPECT_FALSE(group->GetTab(local_tab_id_2)->last_seen_time().has_value()); + EXPECT_FALSE(group->GetTab(local_tab_id_1_)->last_seen_time().has_value()); + EXPECT_NE(base::Time(), group->GetTab(local_tab_id_1_)->navigation_time()); } EXPECT_CALL(*observer_, - OnTabSelected(Eq(std::set<LocalTabID>({local_tab_id_2})))); + OnTabSelected(Eq(std::set<LocalTabID>({local_tab_id_1_})))); // Select tab. EXPECT_CALL(*coordinator_, GetSelectedTabs()) - .WillRepeatedly(Return(std::set<LocalTabID>({local_tab_id_2}))); - tab_group_sync_service_->OnTabSelected(local_group_id_1_, local_tab_id_2, - tab_title_2); + .WillRepeatedly(Return(std::set<LocalTabID>({local_tab_id_1_}))); + tab_group_sync_service_->OnTabSelected(local_group_id_1_, local_tab_id_1_, + u"title 2"); std::optional<SavedTabGroup> group = tab_group_sync_service_->GetGroup(local_group_id_1_); CHECK(group); // Local Tab 2 should get a last_seen time. - const SavedTabGroupTab* tab = group->GetTab(local_tab_id_2); + const SavedTabGroupTab* tab = group->GetTab(local_tab_id_1_); EXPECT_TRUE(tab->last_seen_time().has_value()); - EXPECT_GT(tab->last_seen_time().value(), test_start_time); + EXPECT_EQ(tab->last_seen_time().value(), tab->navigation_time()); histogram_tester.ExpectTotalCount( "TabGroups.Sync.TabGroup.TabSelected.GroupCreateOrigin", 1u);
diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc index ec75e53..ac8073e 100644 --- a/components/segmentation_platform/public/features.cc +++ b/components/segmentation_platform/public/features.cc
@@ -132,10 +132,6 @@ "SegmentationPlatformTimeDelaySampling", base::FEATURE_DISABLED_BY_DEFAULT); -BASE_FEATURE(kSegmentationPlatformCollectTabRankData, - "SegmentationPlatformCollectTabRankData", - base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kSegmentationPlatformModelInitializationDelay, "SegmentationPlatformModelInitializationDelay", base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/components/segmentation_platform/public/features.h b/components/segmentation_platform/public/features.h index e505f7b..69606765 100644 --- a/components/segmentation_platform/public/features.h +++ b/components/segmentation_platform/public/features.h
@@ -95,9 +95,6 @@ // Feature flag for controlling sampling of training data collection. BASE_DECLARE_FEATURE(kSegmentationPlatformTimeDelaySampling); -// Feature flag for enabling data collection for tab ranking. -BASE_DECLARE_FEATURE(kSegmentationPlatformCollectTabRankData); - // Feature flag for intoroducing delay while initializing models at startup. BASE_DECLARE_FEATURE(kSegmentationPlatformModelInitializationDelay);
diff --git a/components/services/storage/service_worker/service_worker_storage.cc b/components/services/storage/service_worker/service_worker_storage.cc index 6fe79961..0a7ad60 100644 --- a/components/services/storage/service_worker/service_worker_storage.cc +++ b/components/services/storage/service_worker/service_worker_storage.cc
@@ -70,15 +70,19 @@ } // namespace ServiceWorkerStorage::StorageSharedBuffer::StorageSharedBuffer() // IN-TEST - : enable_registered_storage_keys_(true), enable_registration_scopes_(true) { + : enable_registered_storage_keys_(true), + enable_registration_scopes_(true), + enable_find_registration_result_(true) { CHECK_IS_TEST(); } ServiceWorkerStorage::StorageSharedBuffer::StorageSharedBuffer( bool enable_registered_storage_keys, - bool enable_registration_scopes) + bool enable_registration_scopes, + bool enable_find_registration_result) : enable_registered_storage_keys_(enable_registered_storage_keys), - enable_registration_scopes_(enable_registration_scopes) {} + enable_registration_scopes_(enable_registration_scopes), + enable_find_registration_result_(enable_find_registration_result) {} ServiceWorkerStorage::StorageSharedBuffer::~StorageSharedBuffer() = default; @@ -122,7 +126,7 @@ std::map<blink::StorageKey, std::vector<GURL>> ServiceWorkerStorage::StorageSharedBuffer::TakeRegistrationScopes() { if (!enable_registration_scopes_) { - return std::map<blink::StorageKey, std::vector<GURL>>(); + return {}; } TRACE_EVENT( "ServiceWorker", @@ -133,6 +137,36 @@ return scopes; } +void ServiceWorkerStorage::StorageSharedBuffer::PutFindRegistrationResult( + const GURL& client_url, + const blink::StorageKey& key, + mojom::ServiceWorkerFindRegistrationResultPtr find_registration_result) { + if (!enable_find_registration_result_) { + return; + } + TRACE_EVENT( + "ServiceWorker", + "ServiceWorkerStorage::StorageSharedBuffer::PutFindRegistrationResult"); + base::AutoLock lock(lock_); + find_registration_results_[std::make_pair(client_url, key)] = + std::move(find_registration_result); +} + +mojom::ServiceWorkerFindRegistrationResultPtr +ServiceWorkerStorage::StorageSharedBuffer::TakeFindRegistrationResult( + const GURL& client_url, + const blink::StorageKey& key) { + if (!enable_find_registration_result_) { + return nullptr; + } + TRACE_EVENT( + "ServiceWorker", + "ServiceWorkerStorage::StorageSharedBuffer::TakeFindRegistrationResult"); + base::AutoLock lock(lock_); + auto result = find_registration_results_.extract(std::pair(client_url, key)); + return !result.empty() ? std::move(result.mapped()) : nullptr; +} + void OverrideMaxServiceWorkerScopeUrlCountForTesting( // IN-TEST std::optional<size_t> max_count) { g_override_max_service_worker_scope_url_count_for_testing = @@ -193,9 +227,7 @@ std::copy(registered_keys_.begin(), registered_keys_.end(), std::back_inserter(registered_keys)); - if (storage_shared_buffer_) { - storage_shared_buffer_->PutRegisteredKeys(registered_keys); - } + storage_shared_buffer().PutRegisteredKeys(registered_keys); std::move(callback).Run(std::move(registered_keys)); } @@ -232,9 +264,7 @@ // Bypass database lookup when there is no stored registration. if (!base::Contains(registered_keys_, key)) { std::optional<std::vector<GURL>> scopes = std::vector<GURL>(); - if (storage_shared_buffer_) { - storage_shared_buffer_->PutRegistrationScopes(key, *scopes); - } + storage_shared_buffer().PutRegistrationScopes(key, *scopes); std::move(callback).Run( /*data=*/nullptr, /*resources=*/nullptr, /*scopes=*/scopes, ServiceWorkerDatabase::Status::kErrorNotFound); @@ -1728,8 +1758,8 @@ if (match != blink::mojom::kInvalidServiceWorkerRegistrationId) status = database_->ReadRegistration(match, key, &data, resources.get()); - if (return_scopes && scopes.has_value() && storage_shared_buffer_) { - storage_shared_buffer_->PutRegistrationScopes(key, *scopes); + if (return_scopes && scopes.has_value()) { + storage_shared_buffer().PutRegistrationScopes(key, *scopes); } std::move(callback).Run(std::move(data), std::move(resources), scopes,
diff --git a/components/services/storage/service_worker/service_worker_storage.h b/components/services/storage/service_worker/service_worker_storage.h index 3112108..68b9844 100644 --- a/components/services/storage/service_worker/service_worker_storage.h +++ b/components/services/storage/service_worker/service_worker_storage.h
@@ -67,7 +67,8 @@ public: StorageSharedBuffer(); StorageSharedBuffer(bool enable_registered_storage_keys, - bool enable_registration_scopes); + bool enable_registration_scopes, + bool enable_find_registration_result); StorageSharedBuffer(const StorageSharedBuffer&) = delete; StorageSharedBuffer& operator=(const StorageSharedBuffer&) = delete; @@ -83,16 +84,33 @@ std::map<blink::StorageKey, std::vector<GURL>> TakeRegistrationScopes() LOCKS_EXCLUDED(lock_); + void PutFindRegistrationResult( + const GURL& client_url, + const blink::StorageKey& key, + mojom::ServiceWorkerFindRegistrationResultPtr find_registration_result) + LOCKS_EXCLUDED(lock_); + mojom::ServiceWorkerFindRegistrationResultPtr TakeFindRegistrationResult( + const GURL& client_url, + const blink::StorageKey& key) LOCKS_EXCLUDED(lock_); + + bool enable_find_registration_result() const { + return enable_find_registration_result_; + } + private: friend class base::RefCountedThreadSafe<StorageSharedBuffer>; ~StorageSharedBuffer(); const bool enable_registered_storage_keys_; const bool enable_registration_scopes_; + const bool enable_find_registration_result_; std::optional<std::vector<blink::StorageKey>> GUARDED_BY(lock_) registered_keys_; std::map<blink::StorageKey, std::vector<GURL>> GUARDED_BY(lock_) registration_scopes_; + std::map<std::pair<GURL, blink::StorageKey>, + mojom::ServiceWorkerFindRegistrationResultPtr> + GUARDED_BY(lock_) find_registration_results_; base::Lock lock_; }; @@ -351,6 +369,10 @@ void GetPurgingResourceIdsForTest(ResourceIdsCallback callback); void GetPurgeableResourceIdsForTest(ResourceIdsCallback callback); void GetUncommittedResourceIdsForTest(ResourceIdsCallback callback); + StorageSharedBuffer& storage_shared_buffer() { + // storage_shared_buffer_ always exists. + return *storage_shared_buffer_; + } private: friend class ServiceWorkerStorageControlImplTest;
diff --git a/components/services/storage/service_worker/service_worker_storage_control_impl.cc b/components/services/storage/service_worker/service_worker_storage_control_impl.cc index 613836c1..0eaa744bc 100644 --- a/components/services/storage/service_worker/service_worker_storage_control_impl.cc +++ b/components/services/storage/service_worker/service_worker_storage_control_impl.cc
@@ -164,7 +164,8 @@ client_url, key, base::BindOnce( &ServiceWorkerStorageControlImpl::DidFindRegistrationForClientUrl, - weak_ptr_factory_.GetWeakPtr(), std::move(callback))); + weak_ptr_factory_.GetWeakPtr(), client_url, key, + std::move(callback))); } void ServiceWorkerStorageControlImpl::FindRegistrationForScope( @@ -452,6 +453,8 @@ } void ServiceWorkerStorageControlImpl::DidFindRegistrationForClientUrl( + GURL client_url, + blink::StorageKey key, FindRegistrationForClientUrlCallback callback, mojom::ServiceWorkerRegistrationDataPtr data, std::unique_ptr<ResourceList> resources, @@ -465,6 +468,19 @@ DCHECK(resources); DCHECK(data); + if (storage_->storage_shared_buffer().enable_find_registration_result()) { + ResourceList copy_of_resources; + copy_of_resources.reserve(resources->size()); + for (const mojom::ServiceWorkerResourceRecordPtr& res : *resources) { + copy_of_resources.push_back(res.Clone()); + } + storage_->storage_shared_buffer().PutFindRegistrationResult( + client_url, key, + mojom::ServiceWorkerFindRegistrationResult::New( + CreateLiveVersionReferenceRemote(data->version_id), data.Clone(), + std::move(copy_of_resources))); + } + mojo::PendingRemote<mojom::ServiceWorkerLiveVersionRef> remote_reference = CreateLiveVersionReferenceRemote(data->version_id); @@ -617,7 +633,8 @@ std::vector<GURL> scopes({kScope}); DidFindRegistrationForClientUrl( - std::move(callback), std::move(data), std::move(resources), scopes, + client_url, key, std::move(callback), std::move(data), + std::move(resources), scopes, storage::mojom::ServiceWorkerDatabaseStatus::kOk); }
diff --git a/components/services/storage/service_worker/service_worker_storage_control_impl.h b/components/services/storage/service_worker/service_worker_storage_control_impl.h index 759c576..f7239fce 100644 --- a/components/services/storage/service_worker/service_worker_storage_control_impl.h +++ b/components/services/storage/service_worker/service_worker_storage_control_impl.h
@@ -196,6 +196,8 @@ // Callbacks for ServiceWorkerStorage methods. void DidFindRegistrationForClientUrl( + GURL client_url, + blink::StorageKey key, FindRegistrationForClientUrlCallback callback, mojom::ServiceWorkerRegistrationDataPtr data, std::unique_ptr<ResourceList> resources,
diff --git a/components/services/storage/service_worker/service_worker_storage_control_impl_unittest.cc b/components/services/storage/service_worker/service_worker_storage_control_impl_unittest.cc index 8c7e2805..3bfc4f3 100644 --- a/components/services/storage/service_worker/service_worker_storage_control_impl_unittest.cc +++ b/components/services/storage/service_worker/service_worker_storage_control_impl_unittest.cc
@@ -757,9 +757,9 @@ return result; } - scoped_refptr<ServiceWorkerStorage::StorageSharedBuffer>& - storage_shared_buffer() { - return storage_shared_buffer_; + ServiceWorkerStorage::StorageSharedBuffer& storage_shared_buffer() { + // storage_shared_buffer_ always exists. + return *storage_shared_buffer_; } private: @@ -786,9 +786,9 @@ { std::vector<blink::StorageKey> storage_keys = GetRegisteredStorageKeys(); EXPECT_EQ(storage_keys.size(), 0UL); - EXPECT_EQ(storage_shared_buffer()->TakeRegisteredKeys()->size(), 0UL); + EXPECT_EQ(storage_shared_buffer().TakeRegisteredKeys()->size(), 0UL); // The 2nd call of TakeRegisteredKeys() returns std::nullopt. - EXPECT_FALSE(storage_shared_buffer()->TakeRegisteredKeys().has_value()); + EXPECT_FALSE(storage_shared_buffer().TakeRegisteredKeys().has_value()); } { @@ -796,12 +796,16 @@ FindRegistrationForClientUrl(kClientUrl, kKey); EXPECT_EQ(result.status, DatabaseStatus::kErrorNotFound); std::map<blink::StorageKey, std::vector<GURL>> registration_scopes = - storage_shared_buffer()->TakeRegistrationScopes(); + storage_shared_buffer().TakeRegistrationScopes(); EXPECT_EQ(registration_scopes.size(), 1UL); EXPECT_TRUE(registration_scopes.contains(kKey)); EXPECT_TRUE(registration_scopes[kKey].empty()); // The 2nd call of TakeRegistrationScopes() returns an empty map. - EXPECT_TRUE(storage_shared_buffer()->TakeRegistrationScopes().empty()); + EXPECT_TRUE(storage_shared_buffer().TakeRegistrationScopes().empty()); + // TakeFindRegistrationResult() returns null if there are no registrations. + EXPECT_TRUE(storage_shared_buffer() + .TakeFindRegistrationResult(kClientUrl, kKey) + .is_null()); } { @@ -869,9 +873,9 @@ EXPECT_EQ(storage_keys.size(), 1UL); EXPECT_EQ(storage_keys[0], kKey); // The obtained keys must be the same as the keys from TakeRegisteredKeys(). - EXPECT_EQ(storage_keys, storage_shared_buffer()->TakeRegisteredKeys()); + EXPECT_EQ(storage_keys, storage_shared_buffer().TakeRegisteredKeys()); // The 2nd call of TakeRegisteredKeys() returns std::nullopt. - EXPECT_FALSE(storage_shared_buffer()->TakeRegisteredKeys().has_value()); + EXPECT_FALSE(storage_shared_buffer().TakeRegisteredKeys().has_value()); } // Find the registration. Find operations should succeed. @@ -896,12 +900,29 @@ EXPECT_EQ(result.status, DatabaseStatus::kOk); std::map<blink::StorageKey, std::vector<GURL>> registration_scopes = - storage_shared_buffer()->TakeRegistrationScopes(); + storage_shared_buffer().TakeRegistrationScopes(); EXPECT_EQ(registration_scopes.size(), 1UL); EXPECT_TRUE(registration_scopes.contains(kKey)); EXPECT_EQ(registration_scopes[kKey], std::vector<GURL>({kScope})); // The 2nd call of TakeRegistrationScopes() returns an empty map. - EXPECT_TRUE(storage_shared_buffer()->TakeRegistrationScopes().empty()); + EXPECT_TRUE(storage_shared_buffer().TakeRegistrationScopes().empty()); + + mojom::ServiceWorkerFindRegistrationResultPtr find_registration_result = + storage_shared_buffer().TakeFindRegistrationResult(kClientUrl, kKey); + EXPECT_EQ(find_registration_result->registration->registration_id, + kRegistrationId); + EXPECT_EQ(find_registration_result->registration->scope, kScope); + EXPECT_EQ(find_registration_result->registration->key, kKey); + EXPECT_EQ(find_registration_result->registration->script, kScriptUrl); + EXPECT_EQ(find_registration_result->registration->version_id, kVersionId); + EXPECT_EQ( + find_registration_result->registration->resources_total_size_bytes, + resources_total_size_bytes); + EXPECT_EQ(find_registration_result->resources.size(), 1UL); + // The 2nd call of TakeFindRegistrationResult() returns null. + EXPECT_TRUE(storage_shared_buffer() + .TakeFindRegistrationResult(kClientUrl, kKey) + .is_null()); } // Delete the registration. @@ -924,12 +945,16 @@ EXPECT_EQ(result.status, DatabaseStatus::kErrorNotFound); std::map<blink::StorageKey, std::vector<GURL>> registration_scopes = - storage_shared_buffer()->TakeRegistrationScopes(); + storage_shared_buffer().TakeRegistrationScopes(); EXPECT_EQ(registration_scopes.size(), 1UL); EXPECT_TRUE(registration_scopes.contains(kKey)); EXPECT_TRUE(registration_scopes[kKey].empty()); // The 2nd call of TakeRegistrationScopes() returns an empty map. - EXPECT_TRUE(storage_shared_buffer()->TakeRegistrationScopes().empty()); + EXPECT_TRUE(storage_shared_buffer().TakeRegistrationScopes().empty()); + // The 2nd call of TakeFindRegistrationResult() returns null. + EXPECT_TRUE(storage_shared_buffer() + .TakeFindRegistrationResult(kClientUrl, kKey) + .is_null()); } }
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn index 11f1385..d890699 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn
@@ -313,3 +313,18 @@ ] } } + +if (!is_android && !is_ios && !is_fuchsia) { + test("full_proto_unittests") { + sources = + [ "protocol/shared_tab_group_data_specifics_full_proto_unittest.cc" ] + + deps = [ + "//base", + "//components/sync/protocol:full_proto", + "//testing/gtest", + "//testing/gtest:gtest_main", + "//third_party/protobuf:protobuf_full", + ] + } +}
diff --git a/components/sync/protocol/BUILD.gn b/components/sync/protocol/BUILD.gn index 5f71ba8..50219ae 100644 --- a/components/sync/protocol/BUILD.gn +++ b/components/sync/protocol/BUILD.gn
@@ -47,3 +47,37 @@ sources = sync_protocol_sources } } + +action("prepare_full_proto") { + script = "prepare_full_proto.py" + + inputs = [ + "sync_collaboration_attribution.proto", + "shared_tab_group_data_specifics.proto", + "unique_position.proto", + ] + + outputs = [ + "$target_gen_dir/sync_collaboration_attribution_full_proto.proto", + "$target_gen_dir/shared_tab_group_data_specifics_full_proto.proto", + "$target_gen_dir/unique_position_full_proto.proto", + ] + + args = [ rebase_path(target_gen_dir, root_build_dir) ] + + foreach(f, inputs) { + args += [ rebase_path(f, root_build_dir) ] + } +} + +proto_library("full_proto") { + testonly = true + proto_in_dir = root_gen_dir + proto_out_dir = "." + sources = get_target_outputs(":prepare_full_proto") + + proto_deps = [ ":prepare_full_proto" ] + + use_protobuf_full = true + import_dirs = [ "//third_party/protobuf/src" ] +}
diff --git a/components/sync/protocol/DEPS b/components/sync/protocol/DEPS index 0048fe50..eae6436 100644 --- a/components/sync/protocol/DEPS +++ b/components/sync/protocol/DEPS
@@ -1,3 +1,4 @@ include_rules = [ "+components/sync/base", + "+google/protobuf/descriptor.h" # for unit tests. ]
diff --git a/components/sync/protocol/prepare_full_proto.py b/components/sync/protocol/prepare_full_proto.py new file mode 100644 index 0000000..2c73c55 --- /dev/null +++ b/components/sync/protocol/prepare_full_proto.py
@@ -0,0 +1,91 @@ +# Copyright 2025 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os +import re +import sys + + +def process_proto_file(input_path, output_path, local_import_basenames): + """Reads an input .proto file and writes a processed version. + + Transformations: + 1. Removes 'option optimize_for = LITE_RUNTIME;'. + 2. Uncomments blocks between '// copybara:uncomment_begin/end'. + 3. Rewrites any import statement that points to another file being processed + in the same batch to use the "_full_proto.proto" suffix. + """ + # Regex to find and capture the path in an import statement. + import_regex = re.compile(r'import\s+"([^"]+\.proto)"') + + # Ensure the output directory exists. + os.makedirs(os.path.dirname(output_path), exist_ok=True) + + with open(input_path, "r") as f_in, open(output_path, "w") as f_out: + in_annotation_block = False + for line in f_in: + # Rule 1: Remove LITE_RUNTIME option. + if "option optimize_for = LITE_RUNTIME;" in line: + continue + + # Rule 2: Handle annotation blocks. + if "copybara:uncomment_begin" in line: + in_annotation_block = True + continue + if "copybara:uncomment_end" in line: + in_annotation_block = False + continue + + # If we are in an annotation block, uncomment the line before + # further processing. + if in_annotation_block: + line = re.sub(r"^(\s*)//\s?(.*)$", r"\1\2", line) + + # Rule 3: Rewrite local imports to use the "_full_proto" suffix. + match = import_regex.search(line) + # Check if this line is an import and if the file it imports is one + # of the other files we are processing in this batch. + if match and os.path.basename(match.group(1)) in local_import_basenames: + original_import_path = match.group(1) + new_import_path = original_import_path.replace( + ".proto", "_full_proto.proto" + ) + line = f'import "{new_import_path}";\n' + + f_out.write(line) + + +def main(): + """Main function to handle command-line arguments. + + It now correctly parses the arguments provided by the BUILD.gn action. + """ + if len(sys.argv) < 3: + print( + "Usage: python3 prepare_full_proto.py <output_dir>" + " <full_input_path1> ..." + ) + sys.exit(1) + + output_dir = sys.argv[1] + + input_paths = sys.argv[2:] + + local_import_basenames = {os.path.basename(p) for p in input_paths} + + print(f"Processing {len(input_paths)} file(s)...") + + for input_path in input_paths: + output_basename = os.path.basename(input_path).replace( + ".proto", "_full_proto.proto" + ) + output_path = os.path.join(output_dir, output_basename) + print(f" - Processing '{input_path}' -> '{output_path}'") + process_proto_file(input_path, output_path, local_import_basenames) + + print("Processing complete.") + + +if __name__ == "__main__": + main()
diff --git a/components/sync/protocol/shared_tab_group_data_specifics.proto b/components/sync/protocol/shared_tab_group_data_specifics.proto index af2b419..f82074e 100644 --- a/components/sync/protocol/shared_tab_group_data_specifics.proto +++ b/components/sync/protocol/shared_tab_group_data_specifics.proto
@@ -16,6 +16,10 @@ package sync_pb; +// copybara:uncomment_begin(google-only) +// import "components/sync/protocol/sync_collaboration_attribution.proto"; +// copybara:uncomment_end + import "components/sync/protocol/unique_position.proto"; // LINT.IfChange(SharedTabGroupDataSpecifics) @@ -42,7 +46,14 @@ message SharedTabGroup { // The displayed title of the group, shown on the tab group. - optional string title = 1; + optional string title = 1 + // copybara:uncomment_begin(google-only) + // [(sync_collaboration_attribution) = { + // attribution_type: LAST_MODIFIED_BY_USER + // name: "tab_group_title" + // }] + // copybara:uncomment_end + ; // These colors map to tab_groups::TabGroupColorId. They DO NOT match the enum // integer values due to "kGrey" being in the "Unspecified" field. @@ -59,7 +70,14 @@ ORANGE = 9; } // The color of the tab group, mapped to tab_groups::TabGroupColorId. - optional Color color = 2; + optional Color color = 2 + // copybara:uncomment_begin(google-only) + // [(sync_collaboration_attribution) = { + // attribution_type: LAST_MODIFIED_BY_USER + // name: "tab_group_color" + // }] + // copybara:uncomment_end + ; // Saved tab group GUID from which this shared tab group was created. optional string originating_tab_group_guid = 3; @@ -67,9 +85,25 @@ message SharedTab { // The URL of the page. - optional string url = 1; + optional string url = 1 + // copybara:uncomment_begin(google-only) + // [(sync_collaboration_attribution) = { + // attribution_type: LAST_MODIFIED_BY_USER + // name: "tab_url" + // }] + // copybara:uncomment_end + ; + // The title of the page. - optional string title = 2; + optional string title = 2 + // copybara:uncomment_begin(google-only) + // [(sync_collaboration_attribution) = { + // attribution_type: LAST_MODIFIED_BY_USER + // name: "tab_title" + // }] + // copybara:uncomment_end + ; + // The GUID of the SharedTabGroup this is a member of. optional string shared_tab_group_guid = 4; // The UniquePosition within a SharedTabGroup. @@ -78,4 +112,7 @@ reserved 3; reserved "favicon_url"; } -// LINT.ThenChange(//components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc:TrimAllSupportedFieldsFromRemoteSpecifics) +// LINT.ThenChange( +// //components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc:TrimAllSupportedFieldsFromRemoteSpecifics, +// //components/sync/protocol/shared_tab_group_data_specifics_full_proto_unittest.cc.cc:ShouldReflectAndReadCustomAnnotations +// )
diff --git a/components/sync/protocol/shared_tab_group_data_specifics_full_proto_unittest.cc b/components/sync/protocol/shared_tab_group_data_specifics_full_proto_unittest.cc new file mode 100644 index 0000000..00144cf --- /dev/null +++ b/components/sync/protocol/shared_tab_group_data_specifics_full_proto_unittest.cc
@@ -0,0 +1,93 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/sync/protocol/shared_tab_group_data_specifics_full_proto.pb.h" +#include "components/sync/protocol/sync_collaboration_attribution_full_proto.pb.h" +#include "google/protobuf/descriptor.h" +#include "testing/gtest/include/gtest/gtest.h" + +using sync_pb::SharedTab; +using sync_pb::SharedTabGroup; +using sync_pb::SharedTabGroupDataSpecifics; +using sync_pb::sync_collaboration_attribution; +using sync_pb::SyncCollaborationAttribution; + +namespace { +// Test annotations in uncommented full proto buffer. +TEST(SharedTabGroupDataSpecificsFullProtoTest, + ShouldReflectAndReadCustomAnnotations) { + const google::protobuf::Descriptor* group_descriptor = + SharedTabGroup::descriptor(); + ASSERT_TRUE(group_descriptor); + + // Verify the 'title' field annotation. + const google::protobuf::FieldDescriptor* group_title_field = + group_descriptor->FindFieldByName("title"); + ASSERT_TRUE(group_title_field); + + const google::protobuf::FieldOptions& group_title_options = + group_title_field->options(); + EXPECT_TRUE(group_title_options.HasExtension(sync_collaboration_attribution)); + + const SyncCollaborationAttribution& group_title_annotation = + group_title_options.GetExtension(sync_collaboration_attribution); + + EXPECT_EQ(group_title_annotation.attribution_type(), + SyncCollaborationAttribution::LAST_MODIFIED_BY_USER); + EXPECT_EQ(group_title_annotation.name(), "tab_group_title"); + + // Verify the 'color' field annotation. + const google::protobuf::FieldDescriptor* group_color_field = + group_descriptor->FindFieldByName("color"); + ASSERT_TRUE(group_color_field); + + const google::protobuf::FieldOptions& group_color_options = + group_color_field->options(); + EXPECT_TRUE(group_color_options.HasExtension(sync_collaboration_attribution)); + + const SyncCollaborationAttribution& group_color_annotation = + group_color_options.GetExtension(sync_collaboration_attribution); + + EXPECT_EQ(group_color_annotation.attribution_type(), + SyncCollaborationAttribution::LAST_MODIFIED_BY_USER); + EXPECT_EQ(group_color_annotation.name(), "tab_group_color"); + + // Test annotations on SharedTab message + const google::protobuf::Descriptor* tab_descriptor = SharedTab::descriptor(); + ASSERT_TRUE(tab_descriptor); + + // Verify the 'url' field annotation. + const google::protobuf::FieldDescriptor* tab_url_field = + tab_descriptor->FindFieldByName("url"); + ASSERT_TRUE(tab_url_field); + + const google::protobuf::FieldOptions& tab_url_options = + tab_url_field->options(); + EXPECT_TRUE(tab_url_options.HasExtension(sync_collaboration_attribution)); + + const SyncCollaborationAttribution& tab_url_annotation = + tab_url_options.GetExtension(sync_collaboration_attribution); + + EXPECT_EQ(tab_url_annotation.attribution_type(), + SyncCollaborationAttribution::LAST_MODIFIED_BY_USER); + EXPECT_EQ(tab_url_annotation.name(), "tab_url"); + + // Verify the 'title' field annotation for tab. + const google::protobuf::FieldDescriptor* tab_title_field = + tab_descriptor->FindFieldByName("title"); + ASSERT_TRUE(tab_title_field); + + const google::protobuf::FieldOptions& tab_title_options = + tab_title_field->options(); + EXPECT_TRUE(tab_title_options.HasExtension(sync_collaboration_attribution)); + + const SyncCollaborationAttribution& tab_title_annotation = + tab_title_options.GetExtension(sync_collaboration_attribution); + + EXPECT_EQ(tab_title_annotation.attribution_type(), + SyncCollaborationAttribution::LAST_MODIFIED_BY_USER); + EXPECT_EQ(tab_title_annotation.name(), "tab_title"); +} + +} // namespace
diff --git a/components/sync/protocol/sync_collaboration_attribution.proto b/components/sync/protocol/sync_collaboration_attribution.proto new file mode 100644 index 0000000..c8b25ea --- /dev/null +++ b/components/sync/protocol/sync_collaboration_attribution.proto
@@ -0,0 +1,54 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = "proto2"; + +option java_multiple_files = true; +option java_package = "org.chromium.components.sync.protocol"; + +package sync_pb; + +import "google/protobuf/descriptor.proto"; + +// Configuration for per-field attribution in collaborative Sync data types. +// Attaching this as an option to a field within a Sync entity's proto +// definition (e.g., in a SharedTab or SharedTabGroup) enables the tracking of +// metadata related to cross-user collaboration, such as which user last +// modified that specific field. +message SyncCollaborationAttribution { + enum AttributionType { + // Default value. No attribution tracking for this field. + NONE = 0; + // Track the user who last modified this field. + LAST_MODIFIED_BY_USER = 1; + } + + // Specifies the type of attribution to be applied to the annotated field. + optional AttributionType attribution_type = 1; + + // A stable identifier for the annotated field, used to distinguish it from + // other fields within the same Chrome Sync data type message that also + // have attribution annotations. This identifier is used to associate + // attribution information (like the last modifier) with this specific field + // of the Sync Entity. + // + // This name is also used in the metadata of SyncEntity that are sent to + // clients, such that the client code key to find the related attribution + // data. + // + // Because of this, the name MUST be unique across all fields annotated with + // `sync_collaboration_attribution` within a single EntitySpecifics. For + // example, all `name` values within `SharedTabGroupData` must be distinct. + // + // Recommended format: `lower_snake_case`. + // Examples: "tab_group_title", "tab_url", "tab_group_color". + optional string name = 2; +} + +extend google.protobuf.FieldOptions { + // IMPORTANT: the extension number needs to be declared. See + // go/extension-declaration-reserved-numbers for more information. + optional SyncCollaborationAttribution sync_collaboration_attribution = + 535801565; +}
diff --git a/components/user_education/common/ntp_promo/ntp_promo_controller.h b/components/user_education/common/ntp_promo/ntp_promo_controller.h index 3c02ea08..afaca2c 100644 --- a/components/user_education/common/ntp_promo/ntp_promo_controller.h +++ b/components/user_education/common/ntp_promo/ntp_promo_controller.h
@@ -10,12 +10,10 @@ #include "base/auto_reset.h" #include "base/feature_list.h" #include "base/memory/raw_ref.h" -#include "components/user_education/common/feature_promo/feature_promo_registry.h" #include "components/user_education/common/ntp_promo/ntp_promo_registry.h" #include "components/user_education/common/ntp_promo/ntp_promo_specification.h" #include "components/user_education/common/user_education_data.h" #include "components/user_education/common/user_education_storage_service.h" -#include "ui/menus/simple_menu_model.h" namespace user_education {
diff --git a/components/user_manager/test_helper.cc b/components/user_manager/test_helper.cc index 5239233c..f8c593b 100644 --- a/components/user_manager/test_helper.cc +++ b/components/user_manager/test_helper.cc
@@ -111,6 +111,13 @@ User* TestHelper::AddUserInternal(const AccountId& account_id, UserType user_type) { + // In production, only when there's no logged in users, a user + // can be added to UserManager. Tests should follow the production + // manner for setting up testing environment. + if (!user_manager_->GetLoggedInUsers().empty()) { + LOG(ERROR) << "There already is logged in user(s)."; + return nullptr; + } if (user_manager_->FindUser(account_id)) { LOG(ERROR) << "User for " << account_id << " already exists"; return nullptr;
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.h b/content/browser/accessibility/dump_accessibility_tree_browsertest.h index 4ad30ed..5bb23d10 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.h +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.h
@@ -93,11 +93,9 @@ } // TODO(accessibility): Replace all tests using RunPopoverHintTest to just - // RunHtmlTest when Popover hints and interest fors are enabled by default. + // RunHtmlTest when `interestfor` is enabled by default. void RunPopoverHintTest(const base::FilePath::CharType* file_path) { base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( - switches::kEnableBlinkFeatures, "HTMLPopoverHint"); - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kEnableBlinkFeatures, "HTMLCommandAttributes"); base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kEnableBlinkFeatures, "HTMLInterestForAttribute");
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc index 4aaaff6..56afe02 100644 --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc
@@ -807,7 +807,7 @@ } map->Add<device::mojom::GamepadHapticsManager>( - base::BindRepeating(&device::GamepadHapticsManager::Create)); + &device::GamepadHapticsManager::Create); map->Add<blink::mojom::GeolocationService>(base::BindRepeating( &RenderFrameHostImpl::GetGeolocationService, base::Unretained(host))); @@ -921,8 +921,7 @@ base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::TaskPriority::USER_VISIBLE})); - map->Add<device::mojom::GamepadMonitor>( - base::BindRepeating(&device::GamepadMonitor::Create)); + map->Add<device::mojom::GamepadMonitor>(&device::GamepadMonitor::Create); map->Add<blink::mojom::WebSensorProvider>(base::BindRepeating( &RenderFrameHostImpl::GetSensorProvider, base::Unretained(host))); @@ -934,7 +933,7 @@ &RenderFrameHostImpl::CreatePaymentManager, base::Unretained(host))); map->Add<handwriting::mojom::HandwritingRecognitionService>( - base::BindRepeating(&CreateHandwritingRecognitionService)); + &CreateHandwritingRecognitionService); if (base::FeatureList::IsEnabled( webnn::mojom::features::kWebMachineLearningNeuralNetwork)) { @@ -1073,13 +1072,12 @@ base::Unretained(host))); map->Add<shape_detection::mojom::BarcodeDetectionProvider>( - base::BindRepeating(&BindBarcodeDetectionProvider)); + &BindBarcodeDetectionProvider); map->Add<shape_detection::mojom::FaceDetectionProvider>( - base::BindRepeating(&BindFaceDetectionProvider)); + &BindFaceDetectionProvider); - map->Add<shape_detection::mojom::TextDetection>( - base::BindRepeating(&BindTextDetection)); + map->Add<shape_detection::mojom::TextDetection>(&BindTextDetection); auto* command_line = base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kEnableGpuBenchmarking)) { @@ -1110,8 +1108,7 @@ #endif #if BUILDFLAG(IS_MAC) - map->Add<blink::mojom::TextInputHost>( - base::BindRepeating(&BindTextInputHost)); + map->Add<blink::mojom::TextInputHost>(&BindTextInputHost); #endif map->Add<blink::mojom::RenderAccessibilityHost>( @@ -1178,69 +1175,63 @@ // by blink. // This avoids renderer kills when no binder is found in the absence of the // production embedder (such as in tests). - map->Add<blink::mojom::NoStatePrefetchProcessor>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::NoStatePrefetchProcessor>)); - map->Add<payments::mojom::PaymentRequest>(base::BindRepeating( - &EmptyBinderForFrame<payments::mojom::PaymentRequest>)); - map->Add<blink::mojom::AnchorElementMetricsHost>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::AnchorElementMetricsHost>)); - map->Add<blink::mojom::CredentialManager>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::CredentialManager>)); - map->Add<blink::mojom::LCPCriticalPathPredictorHost>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::LCPCriticalPathPredictorHost>)); + map->Add<blink::mojom::NoStatePrefetchProcessor>( + &EmptyBinderForFrame<blink::mojom::NoStatePrefetchProcessor>); + map->Add<payments::mojom::PaymentRequest>( + &EmptyBinderForFrame<payments::mojom::PaymentRequest>); + map->Add<blink::mojom::AnchorElementMetricsHost>( + &EmptyBinderForFrame<blink::mojom::AnchorElementMetricsHost>); + map->Add<blink::mojom::CredentialManager>( + &EmptyBinderForFrame<blink::mojom::CredentialManager>); + map->Add<blink::mojom::LCPCriticalPathPredictorHost>( + &EmptyBinderForFrame<blink::mojom::LCPCriticalPathPredictorHost>); if (base::FeatureList::IsEnabled(network::features::kBrowsingTopics) && base::FeatureList::IsEnabled( blink::features::kBrowsingTopicsDocumentAPI)) { map->Add<blink::mojom::BrowsingTopicsDocumentService>( - base::BindRepeating(&BrowsingTopicsDocumentHost::CreateMojoService)); + &BrowsingTopicsDocumentHost::CreateMojoService); } #if !BUILDFLAG(IS_ANDROID) map->Add<blink::mojom::DirectSocketsService>( - base::BindRepeating(&DirectSocketsServiceImpl::CreateForFrame)); - map->Add<media::mojom::SpeechRecognitionContext>(base::BindRepeating( - &EmptyBinderForFrame<media::mojom::SpeechRecognitionContext>)); + &DirectSocketsServiceImpl::CreateForFrame); + map->Add<media::mojom::SpeechRecognitionContext>( + &EmptyBinderForFrame<media::mojom::SpeechRecognitionContext>); map->Add<media::mojom::SpeechRecognitionClientBrowserInterface>( - base::BindRepeating( - &EmptyBinderForFrame< - media::mojom::SpeechRecognitionClientBrowserInterface>)); - map->Add<media::mojom::MediaFoundationRendererNotifier>(base::BindRepeating( - &EmptyBinderForFrame<media::mojom::MediaFoundationRendererNotifier>)); - map->Add<media::mojom::MediaPlayerObserverClient>(base::BindRepeating( - &EmptyBinderForFrame<media::mojom::MediaPlayerObserverClient>)); + &EmptyBinderForFrame< + media::mojom::SpeechRecognitionClientBrowserInterface>); + map->Add<media::mojom::MediaFoundationRendererNotifier>( + &EmptyBinderForFrame<media::mojom::MediaFoundationRendererNotifier>); + map->Add<media::mojom::MediaPlayerObserverClient>( + &EmptyBinderForFrame<media::mojom::MediaPlayerObserverClient>); #endif #if BUILDFLAG(ENABLE_UNHANDLED_TAP) - map->Add<blink::mojom::UnhandledTapNotifier>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::UnhandledTapNotifier>)); + map->Add<blink::mojom::UnhandledTapNotifier>( + &EmptyBinderForFrame<blink::mojom::UnhandledTapNotifier>); #endif map->Add<blink::mojom::BackgroundFetchService>( - base::BindRepeating(&BackgroundFetchServiceImpl::CreateForFrame)); - map->Add<blink::mojom::ColorChooserFactory>( - base::BindRepeating(&BindColorChooserFactoryForFrame)); - map->Add<blink::mojom::EyeDropperChooser>( - base::BindRepeating(&EyeDropperChooserImpl::Create)); + &BackgroundFetchServiceImpl::CreateForFrame); + map->Add<blink::mojom::ColorChooserFactory>(&BindColorChooserFactoryForFrame); + map->Add<blink::mojom::EyeDropperChooser>(&EyeDropperChooserImpl::Create); map->Add<blink::mojom::CookieStore>( - base::BindRepeating(&CookieStoreManager::BindReceiverForFrame)); + &CookieStoreManager::BindReceiverForFrame); map->Add<blink::mojom::ContentIndexService>( - base::BindRepeating(&ContentIndexServiceImpl::CreateForFrame)); + &ContentIndexServiceImpl::CreateForFrame); map->Add<blink::mojom::KeyboardLockService>( - base::BindRepeating(&KeyboardLockServiceImpl::CreateMojoService)); + &KeyboardLockServiceImpl::CreateMojoService); if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) { map->Add<blink::mojom::AdAuctionService>( - base::BindRepeating(&AdAuctionServiceImpl::CreateMojoService)); + &AdAuctionServiceImpl::CreateMojoService); } - map->Add<blink::mojom::MediaSessionService>( - base::BindRepeating(&MediaSessionServiceImpl::Create)); + map->Add<blink::mojom::MediaSessionService>(&MediaSessionServiceImpl::Create); map->Add<blink::mojom::PictureInPictureService>( - base::BindRepeating(&PictureInPictureServiceImpl::Create)); - map->Add<blink::mojom::WakeLockService>( - base::BindRepeating(&WakeLockServiceImpl::Create)); + &PictureInPictureServiceImpl::Create); + map->Add<blink::mojom::WakeLockService>(&WakeLockServiceImpl::Create); #if BUILDFLAG(ENABLE_VR) - map->Add<device::mojom::VRService>( - base::BindRepeating(&VRServiceImpl::Create)); + map->Add<device::mojom::VRService>(&VRServiceImpl::Create); #else map->Add<device::mojom::VRService>( - base::BindRepeating(&EmptyBinderForFrame<device::mojom::VRService>)); + &EmptyBinderForFrame<device::mojom::VRService>); #endif RegisterWebUIControllerInterfaceBinder< private_aggregation_internals::mojom::Factory, @@ -1263,52 +1254,46 @@ WebXrInternalsUI>(map); #endif #if BUILDFLAG(IS_ANDROID) || (BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_IOS_TVOS)) - map->Add<blink::mojom::DateTimeChooser>( - base::BindRepeating(&BindDateTimeChooserForFrame)); + map->Add<blink::mojom::DateTimeChooser>(&BindDateTimeChooserForFrame); #endif #if BUILDFLAG(IS_ANDROID) - map->Add<blink::mojom::TextSuggestionHost>( - base::BindRepeating(&BindTextSuggestionHostForFrame)); + map->Add<blink::mojom::TextSuggestionHost>(&BindTextSuggestionHostForFrame); #else - map->Add<blink::mojom::TextSuggestionHost>(base::BindRepeating( - &EmptyBinderForFrame<blink::mojom::TextSuggestionHost>)); + map->Add<blink::mojom::TextSuggestionHost>( + &EmptyBinderForFrame<blink::mojom::TextSuggestionHost>); #endif // BUILDFLAG(IS_ANDROID) - map->Add<blink::mojom::Authenticator>(base::BindRepeating( + map->Add<blink::mojom::Authenticator>( [](RenderFrameHost* host, mojo::PendingReceiver<blink::mojom::Authenticator> receiver) { static_cast<RenderFrameHostImpl*>(host)->GetWebAuthenticationService( std::move(receiver)); - })); - map->Add<blink::mojom::ClipboardHost>( - base::BindRepeating(&ClipboardHostImpl::Create)); - map->Add<blink::mojom::SpeculationHost>( - base::BindRepeating(&SpeculationHostImpl::Bind)); + }); + map->Add<blink::mojom::ClipboardHost>(&ClipboardHostImpl::Create); + map->Add<blink::mojom::SpeculationHost>(&SpeculationHostImpl::Bind); map->Add<blink::mojom::AnchorElementInteractionHost>( - base::BindRepeating(&AnchorElementInteractionHostImpl::Create)); + &AnchorElementInteractionHostImpl::Create); #if BUILDFLAG(IS_CHROMEOS) if (base::FeatureList::IsEnabled(features::kWebLockScreenApi)) { - map->Add<blink::mojom::LockScreenService>( - base::BindRepeating(&LockScreenServiceImpl::Create)); + map->Add<blink::mojom::LockScreenService>(&LockScreenServiceImpl::Create); } #endif #if BUILDFLAG(IS_FUCHSIA) map->Add<media::mojom::FuchsiaMediaCdmProvider>( - base::BindRepeating(&FuchsiaMediaCdmProviderImpl::Bind)); + &FuchsiaMediaCdmProviderImpl::Bind); #endif map->Add<blink::mojom::OriginTrialStateHost>( - base::BindRepeating(&OriginTrialStateHostImpl::Create)); - map->Add<blink::mojom::StorageAccessHandle>( - base::BindRepeating(&StorageAccessHandle::Create)); + &OriginTrialStateHostImpl::Create); + map->Add<blink::mojom::StorageAccessHandle>(&StorageAccessHandle::Create); - map->Add<optimization_guide::mojom::ModelBroker>(base::BindRepeating( - &EmptyBinderForFrame<optimization_guide::mojom::ModelBroker>)); + map->Add<optimization_guide::mojom::ModelBroker>( + &EmptyBinderForFrame<optimization_guide::mojom::ModelBroker>); if (base::FeatureList::IsEnabled(blink::features::kBuiltInAIAPI)) { map->Add<blink::mojom::AIManager>( - base::BindRepeating(&EmptyBinderForFrame<blink::mojom::AIManager>)); + &EmptyBinderForFrame<blink::mojom::AIManager>); } // This should be last to allow overrides of any interface. @@ -1337,13 +1322,11 @@ // static binders map->Add<shape_detection::mojom::BarcodeDetectionProvider>( - base::BindRepeating(&BindBarcodeDetectionProvider)); + &BindBarcodeDetectionProvider); map->Add<shape_detection::mojom::FaceDetectionProvider>( - base::BindRepeating(&BindFaceDetectionProvider)); - map->Add<shape_detection::mojom::TextDetection>( - base::BindRepeating(&BindTextDetection)); - map->Add<ukm::mojom::UkmRecorderFactory>( - base::BindRepeating(&BindUkmRecorderFactory)); + &BindFaceDetectionProvider); + map->Add<shape_detection::mojom::TextDetection>(&BindTextDetection); + map->Add<ukm::mojom::UkmRecorderFactory>(&BindUkmRecorderFactory); // worker host binders // base::Unretained(host) is safe because the map is owned by @@ -1520,13 +1503,11 @@ // static binders map->Add<shape_detection::mojom::BarcodeDetectionProvider>( - base::BindRepeating(&BindBarcodeDetectionProvider)); + &BindBarcodeDetectionProvider); map->Add<shape_detection::mojom::FaceDetectionProvider>( - base::BindRepeating(&BindFaceDetectionProvider)); - map->Add<shape_detection::mojom::TextDetection>( - base::BindRepeating(&BindTextDetection)); - map->Add<ukm::mojom::UkmRecorderFactory>( - base::BindRepeating(&BindUkmRecorderFactory)); + &BindFaceDetectionProvider); + map->Add<shape_detection::mojom::TextDetection>(&BindTextDetection); + map->Add<ukm::mojom::UkmRecorderFactory>(&BindUkmRecorderFactory); // worker host binders // base::Unretained(host) is safe because the map is owned by @@ -1700,13 +1681,11 @@ map->Add<blink::mojom::FileUtilitiesHost>( base::BindRepeating(&BindFileUtilitiesHost, host)); map->Add<shape_detection::mojom::BarcodeDetectionProvider>( - base::BindRepeating(&BindBarcodeDetectionProvider)); + &BindBarcodeDetectionProvider); map->Add<shape_detection::mojom::FaceDetectionProvider>( - base::BindRepeating(&BindFaceDetectionProvider)); - map->Add<shape_detection::mojom::TextDetection>( - base::BindRepeating(&BindTextDetection)); - map->Add<ukm::mojom::UkmRecorderFactory>( - base::BindRepeating(&BindUkmRecorderFactory)); + &BindFaceDetectionProvider); + map->Add<shape_detection::mojom::TextDetection>(&BindTextDetection); + map->Add<ukm::mojom::UkmRecorderFactory>(&BindUkmRecorderFactory); // worker host binders map->Add<blink::mojom::WebTransportConnector>(base::BindRepeating( @@ -1798,9 +1777,9 @@ base::BindRepeating(&BackgroundFetchServiceImpl::CreateForWorker, host->GetNetworkIsolationKey())); map->Add<blink::mojom::ContentIndexService>( - base::BindRepeating(&ContentIndexServiceImpl::CreateForWorker)); + &ContentIndexServiceImpl::CreateForWorker); map->Add<blink::mojom::CookieStore>( - base::BindRepeating(&CookieStoreManager::BindReceiverForWorker)); + &CookieStoreManager::BindReceiverForWorker); // RenderProcessHost binders taking an origin map->Add<payments::mojom::PaymentManager>(BindServiceWorkerReceiverForOrigin(
diff --git a/content/browser/navigation_mhtml_browsertest.cc b/content/browser/navigation_mhtml_browsertest.cc index 428de24..db90249 100644 --- a/content/browser/navigation_mhtml_browsertest.cc +++ b/content/browser/navigation_mhtml_browsertest.cc
@@ -831,6 +831,58 @@ EXPECT_NE(PAGE_TYPE_ERROR, controller.GetLastCommittedEntry()->GetPageType()); } +class NavigationMhtmlFragmentBrowserTest : public NavigationMhtmlBrowserTest { + public: + NavigationMhtmlFragmentBrowserTest() { + scoped_feature_list_.InitAndEnableFeature( + blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument); + } + + private: + base::test::ScopedFeatureList scoped_feature_list_; +}; + +// Verifies that the first navigation to about:blank#fragment inside an MHTML +// iframe is cross-document (RFH swap / opaque origin) and that a subsequent +// fragment navigation is same-document (no RFH swap, origin unchanged). +IN_PROC_BROWSER_TEST_F(NavigationMhtmlFragmentBrowserTest, + MhtmlAboutBlankFragment_FirstIsCrossDoc_RestAreSameDoc) { + MhtmlArchive mhtml; + mhtml.AddHtmlDocument(GURL("http://example.com"), + "<iframe src=\"about:blank#foo\"></iframe>"); + const GURL mhtml_url = mhtml.Write("index.mhtml"); + + NavigationHandleObserver first_nav(web_contents(), GURL("about:blank#foo")); + ASSERT_TRUE(NavigateToURL(shell(), mhtml_url)); + + RenderFrameHostImpl* main_rfh = main_frame_host(); + ASSERT_EQ(1u, main_rfh->child_count()); + base::WeakPtr<RenderFrameHostImpl> child_rfh = + main_rfh->child_at(0)->current_frame_host()->GetWeakPtr(); + ASSERT_TRUE(child_rfh); + const url::Origin first_origin = child_rfh->GetLastCommittedOrigin(); + + // The initial nav must be cross-document since it uses a new opaque origin. + EXPECT_TRUE(first_nav.has_committed()); + EXPECT_FALSE(first_nav.is_same_document()); + EXPECT_TRUE(first_origin.opaque()); + + // Same document fragment navigation. + NavigationHandleObserver second_nav(web_contents(), GURL("about:blank#bar")); + EXPECT_TRUE(ExecJs(child_rfh, "location.href = 'about:blank#bar';")); + ASSERT_TRUE(WaitForLoadStop(web_contents())); + + base::WeakPtr<RenderFrameHostImpl> after_rfh = + main_rfh->child_at(0)->current_frame_host()->GetWeakPtr(); + ASSERT_TRUE(after_rfh); + + // The second fragment navigation is same-document and doesn't change RFH. + EXPECT_EQ(child_rfh.get(), after_rfh.get()); + EXPECT_TRUE(second_nav.has_committed()); + EXPECT_TRUE(second_nav.is_same_document()); + EXPECT_EQ(first_origin, after_rfh->GetLastCommittedOrigin()); +} + class NavigationMhtmlFencedFrameBrowserTest : public NavigationMhtmlBrowserTest { public:
diff --git a/content/browser/service_worker/service_worker_registry.cc b/content/browser/service_worker/service_worker_registry.cc index 4abed2a..1b9d5de 100644 --- a/content/browser/service_worker/service_worker_registry.cc +++ b/content/browser/service_worker/service_worker_registry.cc
@@ -57,6 +57,10 @@ "ServiceWorkerBackgroundUpdateForServiceWorkerScopeCache", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl, + "ServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl", + base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kReduceCallingServiceWorkerRegisteredStorageKeysOnStartup, "ReduceCallingServiceWorkerRegisteredStorageKeysOnStartup", base::FEATURE_DISABLED_BY_DEFAULT); @@ -250,7 +254,9 @@ base::FeatureList::IsEnabled( kServiceWorkerBackgroundUpdateForRegisteredStorageKeysFieldTrialControlled), base::FeatureList::IsEnabled( - kServiceWorkerBackgroundUpdateForServiceWorkerScopeCache))), + kServiceWorkerBackgroundUpdateForServiceWorkerScopeCache), + base::FeatureList::IsEnabled( + kServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl))), quota_manager_proxy_(quota_manager_proxy), special_storage_policy_(special_storage_policy), registration_scope_cache_(kServiceWorkerScopeCacheLimitSize), @@ -347,15 +353,13 @@ // The following code implements a performance optimization: it retrieves the // registration scopes from the `ServiceWorkerStorage` in the thread pool // without waiting for `DidFindRegistrationForClientUrl()` to be called. - if (storage_shared_buffer_) { - for (const auto& [storage_key, scopes] : - storage_shared_buffer_->TakeRegistrationScopes()) { - // Although StorageSharedBuffer ignores the ordering of the - // FindRegistrationForClientUrl mojo calls, we believe this - // is fine since `registration_scope_cache_` is a large enough cache. - registration_scope_cache_.Put( - storage_key, std::set<GURL>(scopes.begin(), scopes.end())); - } + for (const auto& [storage_key, scopes] : + storage_shared_buffer().TakeRegistrationScopes()) { + // Although StorageSharedBuffer ignores the ordering of the + // FindRegistrationForClientUrl mojo calls, we believe this + // is fine since `registration_scope_cache_` is a large enough cache. + registration_scope_cache_.Put(storage_key, + std::set<GURL>(scopes.begin(), scopes.end())); } // `registration_scope_cache_` provides a full list of scope URLs for the // given blink::StorageKey if the matched entry exists. There are the @@ -412,6 +416,17 @@ } } + storage::mojom::ServiceWorkerFindRegistrationResultPtr preflight_result = + storage_shared_buffer().TakeFindRegistrationResult(client_url, key); + if (!preflight_result.is_null()) { + DidFindRegistrationForClientUrl( + client_url, key, trace_event_id, std::move(callback), + storage::mojom::ServiceWorkerDatabaseStatus::kOk, + std::move(preflight_result), + std::vector(scopes->begin(), scopes->end())); + return; + } + if (base::FeatureList::IsEnabled( kServiceWorkerMergeFindRegistrationForClientUrl)) { std::vector<FindRegistrationCallback>& callbacks = @@ -1010,10 +1025,8 @@ "ServiceWorkerRegistry::DidGetRegisteredStorageKeysOnStartupDeprecated"); DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (storage_shared_buffer_) { - // Discard RegisteredKeys from `storage_shared_buffer_`. - storage_shared_buffer_->TakeRegisteredKeys(); - } + // Discard RegisteredKeys from `storage_shared_buffer_`. + storage_shared_buffer().TakeRegisteredKeys(); if (!registrations_initialized_) { SetRegisteredStorageKeys(storage_keys); @@ -1050,9 +1063,9 @@ // `storage_keys` from the `ServiceWorkerStorage` in the thread pool without // waiting for `DidGetRegisteredStorageKeys()` to be called. This can speed up // navigation during the browser startup phase. - if (!registrations_initialized_ && storage_shared_buffer_) { + if (!registrations_initialized_) { if (std::optional<std::vector<blink::StorageKey>> storage_keys = - storage_shared_buffer_->TakeRegisteredKeys()) { + storage_shared_buffer().TakeRegisteredKeys()) { SetRegisteredStorageKeys(*storage_keys); } } @@ -1339,9 +1352,9 @@ TRACE_EVENT_FLAG_FLOW_IN); DCHECK_CURRENTLY_ON(BrowserThread::UI); // Discard RegistrationScopes from storage_shared_buffer. - if (storage_shared_buffer_) { - storage_shared_buffer_->TakeRegistrationScopes(); - } + storage_shared_buffer().TakeRegistrationScopes(); + // Discard FindRegistrationResult from storage_shared_buffer. + storage_shared_buffer().TakeFindRegistrationResult(client_url, key); if (database_status != storage::mojom::ServiceWorkerDatabaseStatus::kOk && database_status != storage::mojom::ServiceWorkerDatabaseStatus::kErrorNotFound) {
diff --git a/content/browser/service_worker/service_worker_registry.h b/content/browser/service_worker/service_worker_registry.h index 3102a850..ee0fc79 100644 --- a/content/browser/service_worker/service_worker_registry.h +++ b/content/browser/service_worker/service_worker_registry.h
@@ -506,6 +506,11 @@ void StartRemoteCall(std::unique_ptr<InflightCall> call); void FinishRemoteCall(const InflightCall* call); + storage::ServiceWorkerStorage::StorageSharedBuffer& storage_shared_buffer() { + // storage_shared_buffer_ always exists. + return *storage_shared_buffer_; + } + // A helper function to call a mojo remote call that will automatically be // reissued if the mojo::Remote becomes disconnected. To allow the call to be // dispatched multiple times, all arguments must be either be: @@ -542,6 +547,7 @@ // This is a direct communication channel between this ServiceWorkerRegistry // in the UI thread and the ServiceWorkerStorage in the thread pool. + // This must not be null. scoped_refptr<storage::ServiceWorkerStorage::StorageSharedBuffer> storage_shared_buffer_;
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index f22f1f4..fbc83c9 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -316,7 +316,7 @@ CacheTestWebUIController>(map); map->Add<content::mojom::StringWrapper>( - base::BindRepeating(&TestWebUIContentBrowserClient::BindStringWrapper)); + &TestWebUIContentBrowserClient::BindStringWrapper); } static void BindStringWrapper(
diff --git a/content/child/browser_exposed_child_interfaces.cc b/content/child/browser_exposed_child_interfaces.cc index f4e3c43..de39ad5 100644 --- a/content/child/browser_exposed_child_interfaces.cc +++ b/content/child/browser_exposed_child_interfaces.cc
@@ -20,15 +20,14 @@ const bool in_browser_process, mojo::BinderMap* binders) { binders->Add<metrics::mojom::ChildHistogramFetcherFactory>( - base::BindRepeating(&metrics::ChildHistogramFetcherFactoryImpl::Create), - io_task_runner); + &metrics::ChildHistogramFetcherFactoryImpl::Create, io_task_runner); binders->Add<tracing::mojom::TracedProcess>( - base::BindRepeating(&tracing::TracedProcess::OnTracedProcessRequest), + &tracing::TracedProcess::OnTracedProcessRequest, base::SequencedTaskRunner::GetCurrentDefault()); if (!in_browser_process) { binders->Add<mojom::SyntheticTrialConfiguration>( - base::BindRepeating(&ChildProcessSyntheticTrialSyncer::Create), + &ChildProcessSyntheticTrialSyncer::Create, base::SequencedTaskRunner::GetCurrentDefault()); }
diff --git a/content/public/browser/web_ui_browser_interface_broker_registry.h b/content/public/browser/web_ui_browser_interface_broker_registry.h index d844296e..d92382a7 100644 --- a/content/public/browser/web_ui_browser_interface_broker_registry.h +++ b/content/public/browser/web_ui_browser_interface_broker_registry.h
@@ -30,7 +30,7 @@ // binder_map. binder_initializers_->push_back( base::BindRepeating([](WebUIBinderMap* binder_map) { - binder_map->Add<Interface>(base::BindRepeating( + binder_map->Add<Interface>( [](WebUIController* controller, mojo::PendingReceiver<Interface> receiver) { auto* concrete_controller = controller->GetAs<ControllerType>(); @@ -39,7 +39,7 @@ << "The requesting WebUIController is of a different type."; concrete_controller->BindInterface(std::move(receiver)); - })); + }); })); return *this; }
diff --git a/content/public/browser/web_ui_controller_interface_binder.h b/content/public/browser/web_ui_controller_interface_binder.h index 0a4ea7a..54ce6e2 100644 --- a/content/public/browser/web_ui_controller_interface_binder.h +++ b/content/public/browser/web_ui_controller_interface_binder.h
@@ -87,7 +87,7 @@ mojo::BinderMapWithContext<RenderFrameHost*>* map) { DCHECK(!map->Contains<Interface>()) << "A binder for " << Interface::Name_ << " has already been registered."; - map->Add<Interface>(base::BindRepeating( + map->Add<Interface>( [](RenderFrameHost* host, mojo::PendingReceiver<Interface> receiver) { // This is expected to be called only for outermost main frames. if (host->GetParentOrOuterDocument()) { @@ -107,7 +107,7 @@ internal::ReceivedInvalidWebUIControllerMessage(host); return; } - })); + }); } } // namespace content
diff --git a/content/renderer/browser_exposed_renderer_interfaces.cc b/content/renderer/browser_exposed_renderer_interfaces.cc index 519652f0..7123881a 100644 --- a/content/renderer/browser_exposed_renderer_interfaces.cc +++ b/content/renderer/browser_exposed_renderer_interfaces.cc
@@ -187,15 +187,15 @@ DCHECK(render_thread); binders->Add<blink::mojom::SharedWorkerFactory>( - base::BindRepeating(&SharedWorkerFactoryImpl::Create), + &SharedWorkerFactoryImpl::Create, base::SingleThreadTaskRunner::GetCurrentDefault()); binders->Add<mojom::ResourceUsageReporter>( base::BindRepeating(&CreateResourceUsageReporter, render_thread), base::SingleThreadTaskRunner::GetCurrentDefault()); #if BUILDFLAG(IS_ANDROID) binders->Add<auction_worklet::mojom::AuctionWorkletService>( - base::BindRepeating( - &auction_worklet::AuctionWorkletServiceImpl::CreateForRenderer), + + &auction_worklet::AuctionWorkletServiceImpl::CreateForRenderer, base::SingleThreadTaskRunner::GetCurrentDefault()); #endif
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index 084e77a..121b0fda 100644 --- a/content/shell/browser/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc
@@ -673,11 +673,10 @@ PerformanceManagerRegistry::GetInstance() ->GetBinders() .ExposeInterfacesToRenderFrame(map); - map->Add<network_hints::mojom::NetworkHintsHandler>( - base::BindRepeating(&BindNetworkHintsHandler)); + map->Add<network_hints::mojom::NetworkHintsHandler>(&BindNetworkHintsHandler); #if BUILDFLAG(IS_WIN) map->Add<media::mojom::MediaFoundationPreferences>( - base::BindRepeating(&BindMediaFoundationPreferences)); + &BindMediaFoundationPreferences); #endif // BUILDFLAG(IS_WIN) }
diff --git a/content/shell/gpu/shell_content_gpu_client.cc b/content/shell/gpu/shell_content_gpu_client.cc index 12ebdd7..4c5e690 100644 --- a/content/shell/gpu/shell_content_gpu_client.cc +++ b/content/shell/gpu/shell_content_gpu_client.cc
@@ -21,7 +21,7 @@ const gpu::GpuDriverBugWorkarounds& gpu_workarounds, mojo::BinderMap* binders) { binders->Add<mojom::PowerMonitorTest>( - base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), + &PowerMonitorTestImpl::MakeSelfOwnedReceiver, base::SingleThreadTaskRunner::GetCurrentDefault()); }
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc index 49ca6cb..71ce9094 100644 --- a/content/shell/renderer/shell_content_renderer_client.cc +++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -288,13 +288,13 @@ void ShellContentRendererClient::ExposeInterfacesToBrowser( mojo::BinderMap* binders) { binders->Add<mojom::TestService>( - base::BindRepeating(&CreateRendererTestService), + &CreateRendererTestService, base::SingleThreadTaskRunner::GetCurrentDefault()); binders->Add<mojom::PowerMonitorTest>( - base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), + &PowerMonitorTestImpl::MakeSelfOwnedReceiver, base::SingleThreadTaskRunner::GetCurrentDefault()); binders->Add<mojom::MainFrameCounterTest>( - base::BindRepeating(&MainFrameCounterTestImpl::Bind), + &MainFrameCounterTestImpl::Bind, base::SingleThreadTaskRunner::GetCurrentDefault()); binders->Add<web_cache::mojom::WebCache>( base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver,
diff --git a/content/shell/utility/shell_content_utility_client.cc b/content/shell/utility/shell_content_utility_client.cc index 4b7a885f..973a19b 100644 --- a/content/shell/utility/shell_content_utility_client.cc +++ b/content/shell/utility/shell_content_utility_client.cc
@@ -190,7 +190,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrowser( mojo::BinderMap* binders) { binders->Add<mojom::PowerMonitorTest>( - base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), + &PowerMonitorTestImpl::MakeSelfOwnedReceiver, base::SingleThreadTaskRunner::GetCurrentDefault()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) if (register_sandbox_status_helper_) {
diff --git a/content/test/data/accessibility/html/interest-for-expected-auralinux.txt b/content/test/data/accessibility/html/interest-for-expected-auralinux.txt index 121c6a3..5068fbd 100644 --- a/content/test/data/accessibility/html/interest-for-expected-auralinux.txt +++ b/content/test/data/accessibility/html/interest-for-expected-auralinux.txt
@@ -1,13 +1,16 @@ [document web] -++[section] details-for=[push button] +++[panel] details-for=[push button] ++++[entry] selectable-text -++[push button] name='Button' details=[section] details-from:interest-for details-roles:* has-interest-for:true +++[push button] name='Button' details=[panel] details-from:interest-for details-roles:popover has-interest-for:true ++[push button] name='Button' -++[section] +++[panel] ++++[entry] selectable-text -++[section] label-for=[push button] +++[panel] label-for=[push button] ++++[static] name='Plain #3' -++[push button] name='Plain #3' labelled-by=[section] -++[section] description-for=[push button] +++[push button] name='Plain #3' labelled-by=[panel] +++[panel] description-for=[push button] ++++[static] name='Plain #4' -++[push button] name='Button' description='Plain #4' described-by=[section] description-from:tooltip +++[push button] name='Button' description='Plain #4' described-by=[panel] description-from:tooltip +++[section] label-for=[push button] +++++[static] name='Plain #5' +++[push button] name='Plain #5' labelled-by=[section]
diff --git a/content/test/data/accessibility/html/interest-for-expected-blink.txt b/content/test/data/accessibility/html/interest-for-expected-blink.txt index 9c3df8e..9383f35 100644 --- a/content/test/data/accessibility/html/interest-for-expected-blink.txt +++ b/content/test/data/accessibility/html/interest-for-expected-blink.txt
@@ -1,25 +1,29 @@ rootWebArea ++genericContainer ignored ++++genericContainer ignored -++++++genericContainer +++++++group ispopup=auto ++++++++textField ++++++++++genericContainer -++++++button hasInterestFor name='Button' detailsFrom=interestFor detailsIds=genericContainer +++++++button hasInterestFor name='Button' detailsFrom=interestFor detailsIds=group ++++++++staticText name='Button' ++++++++++inlineTextBox name='Button' ++++++button name='Button' ++++++++staticText name='Button' ++++++++++inlineTextBox name='Button' -++++++genericContainer +++++++group ispopup=auto ++++++++textField ++++++++++genericContainer -++++++genericContainer +++++++group ispopup=auto ++++++++staticText name='Plain #3' ++++++++++inlineTextBox name='Plain #3' ++++++button name='Plain #3' -++++++genericContainer +++++++group ispopup=auto ++++++++staticText name='Plain #4' ++++++++++inlineTextBox name='Plain #4' -++++++button description='Plain #4' name='Button' descriptionFrom=interestFor describedbyIds=genericContainer +++++++button description='Plain #4' name='Button' descriptionFrom=interestFor describedbyIds=group ++++++++staticText name='Button' ++++++++++inlineTextBox name='Button' +++++++genericContainer +++++++++staticText name='Plain #5' +++++++++++inlineTextBox name='Plain #5' +++++++button name='Plain #5'
diff --git a/content/test/data/accessibility/html/interest-for-expected-win.txt b/content/test/data/accessibility/html/interest-for-expected-win.txt index cffd636ea..7c1bdf6 100644 --- a/content/test/data/accessibility/html/interest-for-expected-win.txt +++ b/content/test/data/accessibility/html/interest-for-expected-win.txt
@@ -1,13 +1,16 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE -++IA2_ROLE_SECTION +++ROLE_SYSTEM_GROUPING ispopup:auto ++++ROLE_SYSTEM_TEXT FOCUSABLE -++ROLE_SYSTEM_PUSHBUTTON name='Button' FOCUSABLE has-interest-for:true details-from:interest-for details-roles:* +++ROLE_SYSTEM_PUSHBUTTON name='Button' FOCUSABLE has-interest-for:true details-from:interest-for details-roles:popover ++ROLE_SYSTEM_PUSHBUTTON name='Button' FOCUSABLE -++IA2_ROLE_SECTION +++ROLE_SYSTEM_GROUPING ispopup:auto ++++ROLE_SYSTEM_TEXT FOCUSABLE -++IA2_ROLE_SECTION +++ROLE_SYSTEM_GROUPING ispopup:auto ++++ROLE_SYSTEM_STATICTEXT name='Plain #3' ++ROLE_SYSTEM_PUSHBUTTON name='Plain #3' FOCUSABLE -++IA2_ROLE_SECTION +++ROLE_SYSTEM_GROUPING ispopup:auto ++++ROLE_SYSTEM_STATICTEXT name='Plain #4' ++ROLE_SYSTEM_PUSHBUTTON name='Button' FOCUSABLE description-from:tooltip description='Plain #4' +++IA2_ROLE_SECTION +++++ROLE_SYSTEM_STATICTEXT name='Plain #5' +++ROLE_SYSTEM_PUSHBUTTON name='Plain #5' FOCUSABLE
diff --git a/content/test/data/accessibility/html/interest-for.html b/content/test/data/accessibility/html/interest-for.html index 3ef5dfcd..f9bc699 100644 --- a/content/test/data/accessibility/html/interest-for.html +++ b/content/test/data/accessibility/html/interest-for.html
@@ -17,22 +17,35 @@ @AURALINUX-ALLOW:haspopup:* @AURALINUX-ALLOW:has-interest-for* --> + +<style> + [popover] { + display: block; /* Make all popovers visible */ + } +</style> + <!-- Rich interest for --> <!-- Set details relation when target is rich --> -<div id="interestee1"><input></div> +<div popover id="interestee1"><input></div> <button interestfor="interestee1">Button</button> <!-- No details relation when interest for is next in the dom --> <button interestfor="interestee2">Button</button> -<div id="interestee2"><input></div> +<div popover id="interestee2"><input></div> <!-- Plain interest for --> <!-- No details relation when target is not rich, will use as name --> -<div id="interestee3">Plain #3</div> +<div popover id="interestee3">Plain #3</div> <button interestfor="interestee3"></button> <!-- Use as description if there's already a name--> -<div id="interestee4">Plain #4</div> +<div popover id="interestee4">Plain #4</div> <button interestfor="interestee4">Button</button> + +<!-- Non-popover target --> + +<!-- No details relation when target is not a popover --> +<div id="interestee5">Plain #5</div> +<button interestfor="interestee5"></button>
diff --git a/content/utility/browser_exposed_utility_interfaces.cc b/content/utility/browser_exposed_utility_interfaces.cc index 63defeec..5761ac22 100644 --- a/content/utility/browser_exposed_utility_interfaces.cc +++ b/content/utility/browser_exposed_utility_interfaces.cc
@@ -74,7 +74,7 @@ #endif // BUILDFLAG(IS_WIN) if (bind_usage_reporter) { binders->Add<mojom::ResourceUsageReporter>( - base::BindRepeating(&CreateResourceUsageReporter), + &CreateResourceUsageReporter, base::SingleThreadTaskRunner::GetCurrentDefault()); } #endif // !BUILDFLAG(IS_ANDROID)
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc index 1aeb38ac..66a10226 100644 --- a/content/web_test/browser/web_test_content_browser_client.cc +++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -562,7 +562,7 @@ mojo::BinderMapWithContext<RenderFrameHost*>* map) { ShellContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( render_frame_host, map); - map->Add<mojom::MojoWebTestHelper>(base::BindRepeating(&BindWebTestHelper)); + map->Add<mojom::MojoWebTestHelper>(&BindWebTestHelper); map->Add<blink::mojom::ClipboardHost>(base::BindRepeating( &WebTestContentBrowserClient::BindClipboardHost, base::Unretained(this))); map->Add<blink::mojom::BadgeService>(base::BindRepeating(
diff --git a/extensions/browser/extension_registrar.cc b/extensions/browser/extension_registrar.cc index e46ded6..bc1c9e7 100644 --- a/extensions/browser/extension_registrar.cc +++ b/extensions/browser/extension_registrar.cc
@@ -519,6 +519,12 @@ << old_version_string << "' to " << extension->version().GetString(); + // If there was a previous installation, we need to clear the extension + // service worker. This is a workaround to ensure component extension + // updates are applied. See crbug.com/425464855. + if (old_version.IsValid()) { + UnregisterServiceWorkerWithRootScope(extension); + } // TODO(crbug.com/40508457): If needed, add support for Declarative Net // Request to component extensions and pass the ruleset install prefs here. AddNewOrUpdatedExtension(extension, {}, kInstallFlagNone,
diff --git a/fuchsia_web/webengine/browser/web_engine_browser_interface_binders.cc b/fuchsia_web/webengine/browser/web_engine_browser_interface_binders.cc index 9cd36fe..171cc9e 100644 --- a/fuchsia_web/webengine/browser/web_engine_browser_interface_binders.cc +++ b/fuchsia_web/webengine/browser/web_engine_browser_interface_binders.cc
@@ -12,5 +12,5 @@ void PopulateFuchsiaFrameBinders( mojo::BinderMapWithContext<content::RenderFrameHost*>* map) { map->Add<mojom::WebEngineMediaResourceProvider>( - base::BindRepeating(&WebEngineMediaResourceProviderImpl::Bind)); + &WebEngineMediaResourceProviderImpl::Bind); }
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl index aaf0c2a4..64c280b6 100644 --- a/infra/config/generated/testing/test_suites.pyl +++ b/infra/config/generated/testing/test_suites.pyl
@@ -2594,20 +2594,26 @@ }, 'chromeos_vmlab_tests': { - 'chromeos_chrome_all_tast_tests': { + 'chromeos_chrome_all_tast_tests_tfc': { 'mixins': [ - 'skylab-shards-20', + 'skylab-50-tests-per-shard', ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_criticalstaging_tast_tests': { + 'chromeos_chrome_criticalstaging_tast_tests_tfc': { + 'mixins': [ + 'skylab-50-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_disabled_tast_tests': { + 'chromeos_chrome_disabled_tast_tests_tfc': { + 'mixins': [ + 'skylab-20-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], @@ -2641,17 +2647,26 @@ }, 'chromeos_vmlab_tests_no_gtests': { - 'chromeos_chrome_all_tast_tests': { + 'chromeos_chrome_all_tast_tests_tfc': { + 'mixins': [ + 'skylab-50-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_criticalstaging_tast_tests': { + 'chromeos_chrome_criticalstaging_tast_tests_tfc': { + 'mixins': [ + 'skylab-50-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_disabled_tast_tests': { + 'chromeos_chrome_disabled_tast_tests_tfc': { + 'mixins': [ + 'skylab-20-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], @@ -2664,17 +2679,26 @@ }, 'chromeos_vmlab_tests_no_gtests_no_arc': { - 'chromeos_chrome_all_tast_tests': { + 'chromeos_chrome_all_tast_tests_tfc': { + 'mixins': [ + 'skylab-50-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_criticalstaging_tast_tests': { + 'chromeos_chrome_criticalstaging_tast_tests_tfc': { + 'mixins': [ + 'skylab-50-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ], }, - 'chromeos_chrome_disabled_tast_tests': { + 'chromeos_chrome_disabled_tast_tests_tfc': { + 'mixins': [ + 'skylab-20-tests-per-shard', + ], 'variants': [ 'CROS_RELEASE_LKGM', ],
diff --git a/infra/config/targets/matrix_compound_suites.star b/infra/config/targets/matrix_compound_suites.star index 50006132..e69d038 100644 --- a/infra/config/targets/matrix_compound_suites.star +++ b/infra/config/targets/matrix_compound_suites.star
@@ -14,20 +14,27 @@ targets.legacy_matrix_compound_suite( name = "chromeos_vmlab_tests", basic_suites = { - "chromeos_chrome_all_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_all_tast_tests_tfc": targets.legacy_matrix_config( mixins = [ - "skylab-shards-20", + "skylab-50-tests-per-shard", ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_criticalstaging_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_criticalstaging_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + "skylab-50-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_disabled_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_disabled_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + # Setting smaller max_in_shard to offset tast level retries. + "skylab-20-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], @@ -66,17 +73,27 @@ targets.legacy_matrix_compound_suite( name = "chromeos_vmlab_tests_no_gtests", basic_suites = { - "chromeos_chrome_all_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_all_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + "skylab-50-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_criticalstaging_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_criticalstaging_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + "skylab-50-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_disabled_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_disabled_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + # Setting smaller max_in_shard to offset tast level retries. + "skylab-20-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], @@ -92,17 +109,27 @@ targets.legacy_matrix_compound_suite( name = "chromeos_vmlab_tests_no_gtests_no_arc", basic_suites = { - "chromeos_chrome_all_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_all_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + "skylab-50-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_criticalstaging_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_criticalstaging_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + "skylab-50-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ], ), - "chromeos_chrome_disabled_tast_tests": targets.legacy_matrix_config( + "chromeos_chrome_disabled_tast_tests_tfc": targets.legacy_matrix_config( + mixins = [ + # Setting smaller max_in_shard to offset tast level retries. + "skylab-20-tests-per-shard", + ], variants = [ "CROS_RELEASE_LKGM", ],
diff --git a/infra/inclusive_language_presubmit_exempt_dirs.txt b/infra/inclusive_language_presubmit_exempt_dirs.txt index 8643d15f..81c4c81 100644 --- a/infra/inclusive_language_presubmit_exempt_dirs.txt +++ b/infra/inclusive_language_presubmit_exempt_dirs.txt
@@ -119,6 +119,7 @@ components/cast/named_message_port_connector components/cbor components/certificate_transparency +components/component_updater/installer_policies components/domain_reliability components/enterprise/obfuscation/core components/gcm_driver @@ -166,7 +167,6 @@ content/browser/fenced_frame content/browser/loader content/browser/renderer_host -content/browser/renderer_host/pepper content/browser/sms content/browser/tracing content/child @@ -175,12 +175,12 @@ content/public/browser content/public/common content/renderer -content/renderer/pepper content/test/gpu content/web_test/renderer device/gamepad device/vr/public/mojom docs +docs/client_hints docs/design docs/enterprise docs/experiments @@ -238,17 +238,6 @@ media/test media/test/data media/test/data/hls -native_client_sdk/doc_generated/migration -native_client_sdk/doc_generated/reference/sandbox_internals -native_client_sdk/src/build_tools -native_client_sdk/src/build_tools/tests -native_client_sdk/src/doc -native_client_sdk/src/doc/doxygen -native_client_sdk/src/doc/migration -native_client_sdk/src/doc/reference/sandbox_internals -native_client_sdk/src/gonacl_appengine/src -native_client_sdk/src/tools/lib/tests/data -native_client_sdk/src/tools/tests net/base/registry_controlled_domains net/data/fuzzer_dictionaries net/disk_cache/blockfile
diff --git a/internal b/internal index 650f111..eb1be97 160000 --- a/internal +++ b/internal
@@ -1 +1 @@ -Subproject commit 650f1113f1754ec7d793132532e9abbb8629a954 +Subproject commit eb1be97cc81de54733a96ad8c2f933be5fe8a997
diff --git a/ios/chrome/browser/collaboration/model/ios_collaboration_controller_delegate.mm b/ios/chrome/browser/collaboration/model/ios_collaboration_controller_delegate.mm index b553bca..772b058 100644 --- a/ios/chrome/browser/collaboration/model/ios_collaboration_controller_delegate.mm +++ b/ios/chrome/browser/collaboration/model/ios_collaboration_controller_delegate.mm
@@ -198,19 +198,25 @@ message:message]; if (error.type() == ErrorInfo::Type::kUpdateChromeUiForVersionOutOfDate) { + auto split_result_callback = base::SplitOnceCallback(std::move(result)); + auto update_action = base::CallbackToBlock( base::BindOnce(&IOSCollaborationControllerDelegate::Update, - weak_ptr_factory_.GetWeakPtr(), std::move(result))); + weak_ptr_factory_.GetWeakPtr(), + std::move(split_result_callback.first))); [alert_coordinator_ addItemWithTitle: l10n_util::GetNSString( IDS_COLLABORATION_CHROME_OUT_OF_DATE_ERROR_DIALOG_UPDATE_BUTTON) action:update_action - style:UIAlertActionStyleDefault]; + style:UIAlertActionStyleDefault + preferred:YES + enabled:YES]; auto dismiss_action = base::CallbackToBlock( base::BindOnce(&IOSCollaborationControllerDelegate::ErrorAccepted, - weak_ptr_factory_.GetWeakPtr(), std::move(result))); + weak_ptr_factory_.GetWeakPtr(), + std::move(split_result_callback.second))); [alert_coordinator_ addItemWithTitle: l10n_util::GetNSString(
diff --git a/ios/chrome/browser/price_insights/model/price_insights_feature.mm b/ios/chrome/browser/price_insights/model/price_insights_feature.mm index 05e432c..ec5659f 100644 --- a/ios/chrome/browser/price_insights/model/price_insights_feature.mm +++ b/ios/chrome/browser/price_insights/model/price_insights_feature.mm
@@ -25,7 +25,7 @@ bool IsPriceInsightsRegionEnabled() { return commerce::IsRegionLockedFeatureEnabled( - commerce::kPriceInsights, commerce::kPriceInsightsRegionLaunched, + commerce::kPriceInsights, GetCurrentCountryCode(GetApplicationContext()->GetVariationsService()), GetApplicationContext()->GetApplicationLocaleStorage()->Get()); }
diff --git a/ios/chrome/browser/shared/coordinator/alert/alert_coordinator.mm b/ios/chrome/browser/shared/coordinator/alert/alert_coordinator.mm index ac59b41..020e550 100644 --- a/ios/chrome/browser/shared/coordinator/alert/alert_coordinator.mm +++ b/ios/chrome/browser/shared/coordinator/alert/alert_coordinator.mm
@@ -55,7 +55,7 @@ action:actionBlock style:style preferred:NO - enabled:YES]; + enabled:enabled]; } - (void)addItemWithTitle:(NSString*)title
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/BUILD.gn b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/BUILD.gn index 2716ea8f..4caba4fb 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/BUILD.gn +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/BUILD.gn
@@ -352,6 +352,7 @@ deps = [ ":tab_groups_constant", "//base", + "//base/test:test_support", "//ios/chrome/app/strings", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_egtest.mm b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_egtest.mm index 9888eed..408a9b0 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_egtest.mm +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_egtest.mm
@@ -57,6 +57,7 @@ using chrome_test_util::KeepSharedConfirmationButton; using chrome_test_util::LeaveSharedGroupButton; using chrome_test_util::LeaveSharedGroupConfirmationButton; +using chrome_test_util::LongPressTabGroupCellAtIndex; using chrome_test_util::ManageGroupButton; using chrome_test_util::NavigationBarCancelButton; using chrome_test_util::NavigationBarSaveButton; @@ -118,14 +119,6 @@ @"Long press failed."); } -// Long presses a tab group cell. -void LongPressTabGroupCellAtIndex(unsigned int index) { - // Make sure the cell has appeared. Otherwise, long pressing can be flaky. - [ChromeEarlGrey - waitForUIElementToAppearWithMatcher:TabGridGroupCellAtIndex(index)]; - LongPressOn(TabGridGroupCellAtIndex(index)); -} - // Shares the group at `index`. void ShareGroupAtIndex(unsigned int index) { // Share the first group.
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_signin_egtest.mm b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_signin_egtest.mm index d23855a..97b8f99 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_signin_egtest.mm +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/shared_tab_groups_signin_egtest.mm
@@ -42,6 +42,7 @@ using chrome_test_util::CreateTabGroupAtIndex; using chrome_test_util::FakeJoinFlowView; using chrome_test_util::FakeShareFlowView; +using chrome_test_util::LongPressTabGroupCellAtIndex; using chrome_test_util::ManageGroupButton; using chrome_test_util::NavigationBarCancelButton; using chrome_test_util::NavigationBarSaveButton; @@ -56,23 +57,6 @@ // keyboard default can differ iPhone vs iPad, simulator vs device. NSString* const kGroup1Name = @"1group"; -// Long press on the given matcher. -void LongPressOn(id<GREYMatcher> matcher) { - // Ensure the element is visible. - [ChromeEarlGrey waitForUIElementToAppearWithMatcher:matcher]; - [ChromeEarlGreyUI waitForAppToIdle]; - ConditionBlock condition = ^{ - NSError* error = nil; - [[EarlGrey selectElementWithMatcher:matcher] performAction:grey_longPress() - error:&error]; - return error == nil; - }; - - GREYAssert(base::test::ios::WaitUntilConditionOrTimeout( - base::test::ios::kWaitForUIElementTimeout, condition), - @"Long press failed."); -} - // Waits for the fake join flow view to appear. void WaitForFakeJoinFlowView() { GREYCondition* waitForFakeJoinFlowView = [GREYCondition @@ -89,14 +73,6 @@ @"The fake join flow view did not appear."); } -// Long presses a tab group cell. -void LongPressTabGroupCellAtIndex(unsigned int index) { - // Make sure the cell has appeared. Otherwise, long pressing can be flaky. - [ChromeEarlGrey - waitForUIElementToAppearWithMatcher:TabGridGroupCellAtIndex(index)]; - LongPressOn(TabGridGroupCellAtIndex(index)); -} - // Returns the completely configured AppLaunchConfiguration (i.e. setting all // the underlying feature dependencies), with the Shared Tab Groups flavor as a // parameter.
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.h b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.h index 29c07f7..2058366 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.h +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.h
@@ -21,6 +21,9 @@ // Opens the tab group at `group_cell_index`. void OpenTabGroupAtIndex(int group_cell_index); +// Long presses a tab group cell. +void LongPressTabGroupCellAtIndex(unsigned int index); + } // namespace chrome_test_util #endif // IOS_CHROME_BROWSER_TAB_SWITCHER_UI_BUNDLED_TAB_GRID_TAB_GROUPS_TAB_GROUPS_EG_UTILS_H_
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.mm b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.mm index d0b0465..1422166f 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.mm +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.mm
@@ -4,13 +4,17 @@ #import "ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_eg_utils.h" +#import "base/test/ios/wait_util.h" #import "ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_groups_constants.h" #import "ios/chrome/grit/ios_strings.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" +#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h" #import "ios/chrome/test/earl_grey/chrome_matchers.h" #import "ios/testing/earl_grey/earl_grey_test.h" #import "ui/base/l10n/l10n_util.h" +using base::test::ios::kWaitForUIElementTimeout; +using base::test::ios::WaitUntilConditionOrTimeout; using chrome_test_util::ContextMenuItemWithAccessibilityLabelId; using chrome_test_util::CreateTabGroupTextField; using chrome_test_util::TabGridCellAtIndex; @@ -57,6 +61,22 @@ [ChromeEarlGrey simulatePhysicalKeyboardEvent:group_name flags:0]; } +// Long press on the given matcher. +void LongPressOn(id<GREYMatcher> matcher) { + // Ensure the element is visible. + [ChromeEarlGrey waitForUIElementToAppearWithMatcher:matcher]; + [ChromeEarlGreyUI waitForAppToIdle]; + ConditionBlock condition = ^{ + NSError* error = nil; + [[EarlGrey selectElementWithMatcher:matcher] performAction:grey_longPress() + error:&error]; + return error == nil; + }; + + GREYAssert(WaitUntilConditionOrTimeout(kWaitForUIElementTimeout, condition), + @"Long press failed."); +} + } // namespace namespace chrome_test_util { @@ -87,4 +107,12 @@ kTabGroupViewTitleIdentifier)]; } +// Long presses a tab group cell. +void LongPressTabGroupCellAtIndex(unsigned int index) { + // Make sure the cell has appeared. Otherwise, long pressing can be flaky. + [ChromeEarlGrey + waitForUIElementToAppearWithMatcher:TabGridGroupCellAtIndex(index)]; + LongPressOn(TabGridGroupCellAtIndex(index)); +} + } // namespace chrome_test_util
diff --git a/ios/web/navigation/navigation_manager_impl_unittest.mm b/ios/web/navigation/navigation_manager_impl_unittest.mm index f0d5818..5f3865076 100644 --- a/ios/web/navigation/navigation_manager_impl_unittest.mm +++ b/ios/web/navigation/navigation_manager_impl_unittest.mm
@@ -2480,11 +2480,11 @@ // Tests that all NavigationManager APIs return reasonable values in the Empty // Window Open Navigation edge case. See comments in header file for details. -// TODO(crbug.com/425579167) Re-enable the test -// The URL method is not always called on CQ. -TEST_F(NavigationManagerTest, DISABLED_EmptyWindowOpenNavigation) { +TEST_F(NavigationManagerTest, EmptyWindowOpenNavigation) { // Set up the precondition for an empty window open item. - OCMExpect([mock_web_view_ URL]) + // Use OCMStub for `URL` instead of OCMExpect because it will only be called + // when DCHECKS are enabled. + OCMStub([mock_web_view_ URL]) .andReturn(net::NSURLWithGURL(GURL(url::kAboutBlankURL))); mock_wk_list_.currentItem = nil;
diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc index d838c34..4944c978 100644 --- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc +++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
@@ -630,28 +630,37 @@ scoped_refptr<VideoFrame> frame, const EncodeOptions& options) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + bool force_key_frame = + (input_since_keyframe_count_ + pending_input_queue_.size()) % + gop_length_ == + 0; + EncodeOptions effective_options(options); + effective_options.key_frame |= force_key_frame; + // Avoid corruption triggered by consecutive key frames on Intel drivers. // See also https://crbug.com/40069818 and https://crbug.com/378681055. - if (codec_ == VideoCodec::kVP9 && - last_frame_was_keyframe_request_ && options.key_frame) { + if (codec_ == VideoCodec::kVP9 && last_frame_was_keyframe_request_ && + effective_options.key_frame) { // Force a fake frame in between two key frames that come in a row. The // MFVEA will discard the output of this frame, and the client will never // see any side effects, but it helps working around crbug.com/1473665. EncodeOptions discard_options(/*key_frame=*/false); EncodeInternal(frame, discard_options, /*discard_output=*/true); - } - bool force_key_frame = - (input_since_keyframe_count_ + pending_input_queue_.size()) % - gop_length_ == - 0; + // If the |force_key_frame| is true, it indicates that the above fake frame + // will also be a keyframe. In this case, we need to generate an additional + // fake frame to avoid consecutive keyframes. + if (force_key_frame) { + EncodeInternal(frame, discard_options, /*discard_output=*/true); + } + } bool discard_high_layer_frames = (((codec_ == VideoCodec::kVP9 || codec_ == VideoCodec::kAV1) && vendor_ == DriverVendor::kIntel) || (codec_ == VideoCodec::kH264 && (vendor_ == DriverVendor::kIntel || vendor_ == DriverVendor::kNvidia))) && - IsTemporalScalabilityCoding() && (options.key_frame || force_key_frame); + IsTemporalScalabilityCoding() && effective_options.key_frame; if (discard_high_layer_frames) { // Currently, Intel and NVIDIA drivers only allow apps to request keyframe @@ -671,8 +680,8 @@ } } - EncodeInternal(std::move(frame), options, /*discard_output=*/false); - last_frame_was_keyframe_request_ = options.key_frame; + EncodeInternal(std::move(frame), effective_options, /*discard_output=*/false); + last_frame_was_keyframe_request_ = effective_options.key_frame; } void MediaFoundationVideoEncodeAccelerator::QueueInput( @@ -1722,11 +1731,8 @@ return E_FAIL; } } else { - // Force key frame for the first frame in GOP. - bool force_key_frame = input_since_keyframe_count_ % gop_length_ == 0; - // Reset the frame count when keyframe is requested. - if (input.options.key_frame || force_key_frame) { + if (input.options.key_frame) { input_since_keyframe_count_ = 0; } @@ -1740,7 +1746,7 @@ } else if (rate_ctrl_ && !input.discard_output) { VideoRateControlWrapper::FrameParams frame_params{}; frame_params.frame_type = - input.options.key_frame || force_key_frame + input.options.key_frame ? VideoRateControlWrapper::FrameParams::FrameType::kKeyFrame : VideoRateControlWrapper::FrameParams::FrameType::kInterFrame; // H.264 and H.265 SW BRC need timestamp information. @@ -1783,7 +1789,7 @@ var.ullVal); RETURN_ON_HR_FAILURE(hr, "Couldn't set input sample attribute QP", hr); } - if (input.options.key_frame || force_key_frame) { + if (input.options.key_frame) { VARIANT var; var.vt = VT_UI4; var.ulVal = 1;
diff --git a/mojo/public/cpp/bindings/binder_map.h b/mojo/public/cpp/bindings/binder_map.h index 9aaa59f..d5d3776 100644 --- a/mojo/public/cpp/bindings/binder_map.h +++ b/mojo/public/cpp/bindings/binder_map.h
@@ -46,6 +46,9 @@ template <typename Interface> using BinderType = typename Traits::template BinderType<Interface>; + template <typename Interface> + using FuncType = typename Traits::template FuncType<Interface>; + BinderMapWithContext() = default; BinderMapWithContext(const BinderMapWithContext&) = default; BinderMapWithContext(BinderMapWithContext&&) = default; @@ -61,14 +64,34 @@ // // more easily. // - // If |Add()| is called multiple times for the same interface, the most - // recent one replaces any existing binder. + // If Add() is called multiple times for the same interface, the most recent + // one replaces any existing binder. template <typename Interface> - void Add(std::common_type_t<BinderType<Interface>> binder, + void Add(std::type_identity_t<BinderType<Interface>> binder, scoped_refptr<base::SequencedTaskRunner> task_runner = nullptr) { - binders_[Interface::Name_] = std::make_unique< - internal::GenericCallbackBinderWithContext<ContextType>>( - Traits::MakeGenericBinder(std::move(binder)), std::move(task_runner)); + Add(internal::StaticString(Interface::Name_), + std::make_unique< + internal::GenericCallbackBinderWithContext<ContextType>>( + Traits::MakeGenericBinder(std::move(binder)), + std::move(task_runner))); + } + + // Adds a new binder specifically for Interface functors. This exists for the + // convenience of being able to register strongly-typed functors like: + // + // void OnBindFoo(mojo::PendingReceiver<Foo> receiver) { ... } + // + // more easily. + // + // If Add() is called multiple times for the same interface, the most recent + // one replaces any existing binder. + template <typename Interface> + void Add(std::type_identity_t<FuncType<Interface>>* func, + scoped_refptr<base::SequencedTaskRunner> task_runner = nullptr) { + Add(internal::StaticString(Interface::Name_), + std::make_unique< + internal::GenericCallbackBinderWithContext<ContextType>>( + Traits::MakeGenericBinder(func), std::move(task_runner))); } // Returns true if this map contains a binder for `Interface` receivers. @@ -135,6 +158,20 @@ private: using IsVoidContext = std::is_same<ContextType, void>; + void Add( + internal::StaticString name, + std::unique_ptr<internal::GenericCallbackBinderWithContext<ContextType>> + binder) { + // This is not a public method because it is not safe to use with a + // non-static `name`. The map key is a `string_view` which would result in + // a dangling pointer if the underlying string were to be freed. + // + // While it may be possible to make this safe by using `std::string` as the + // key, this is explicitly not supported, as we want to avoid the overhead + // of copying strings at runtime. + binders_[std::string_view(name)] = std::move(binder); + } + std::map< std::string_view, std::unique_ptr<internal::GenericCallbackBinderWithContext<ContextType>>>
diff --git a/mojo/public/cpp/bindings/lib/binder_map_internal.h b/mojo/public/cpp/bindings/lib/binder_map_internal.h index 9892cc6..ca793af 100644 --- a/mojo/public/cpp/bindings/lib/binder_map_internal.h +++ b/mojo/public/cpp/bindings/lib/binder_map_internal.h
@@ -15,6 +15,22 @@ namespace mojo { namespace internal { +// A wrapper around a string literal that can be used to verify at compile time +// that the string has a static lifetime. This is achieved by using a +// `consteval` constructor, which ensures that the constructor is evaluated at +// compile time. Since the constructor takes a `const char*`, the compiler can +// only evaluate it if the provided string is a literal with a static lifetime. +// If a string with a dynamic lifetime is passed, the compilation will fail. +class StaticString { + public: + explicit consteval StaticString(const char* str) : str_(str) {} + + explicit operator std::string_view() const { return str_; } + + private: + const char* str_; +}; + template <typename ContextType> struct BinderContextTraits { using ValueType = ContextType; @@ -28,6 +44,9 @@ mojo::PendingReceiver<Interface> receiver)>; template <typename Interface> + using FuncType = void(ContextType, mojo::PendingReceiver<Interface> receiver); + + template <typename Interface> static GenericBinderType MakeGenericBinder(BinderType<Interface> binder) { return base::BindRepeating(&BindGenericReceiver<Interface>, std::move(binder)); @@ -40,6 +59,19 @@ binder.Run(std::move(context), mojo::PendingReceiver<Interface>(std::move(receiver_pipe))); } + + template <typename Interface> + static GenericBinderType MakeGenericBinder(FuncType<Interface>* func) { + return base::BindRepeating(&BindGenericFunctor<Interface>, func); + } + + template <typename Interface> + static void BindGenericFunctor(FuncType<Interface>* func, + ContextType context, + mojo::ScopedMessagePipeHandle receiver_pipe) { + func(std::move(context), + mojo::PendingReceiver<Interface>(std::move(receiver_pipe))); + } }; template <> @@ -58,6 +90,9 @@ base::RepeatingCallback<void(mojo::PendingReceiver<Interface> receiver)>; template <typename Interface> + using FuncType = void(mojo::PendingReceiver<Interface> receiver); + + template <typename Interface> static GenericBinderType MakeGenericBinder(BinderType<Interface> binder) { return base::BindRepeating(&BindGenericReceiver<Interface>, std::move(binder)); @@ -68,6 +103,17 @@ mojo::ScopedMessagePipeHandle receiver_pipe) { binder.Run(mojo::PendingReceiver<Interface>(std::move(receiver_pipe))); } + + template <typename Interface> + static GenericBinderType MakeGenericBinder(FuncType<Interface>* func) { + return base::BindRepeating(&BindGenericFunctor<Interface>, func); + } + + template <typename Interface> + static void BindGenericFunctor(FuncType<Interface>* func, + mojo::ScopedMessagePipeHandle receiver_pipe) { + func(mojo::PendingReceiver<Interface>(std::move(receiver_pipe))); + } }; template <typename ContextType>
diff --git a/mojo/public/cpp/bindings/tests/BUILD.gn b/mojo/public/cpp/bindings/tests/BUILD.gn index 2bcad9e2..5f9fe51 100644 --- a/mojo/public/cpp/bindings/tests/BUILD.gn +++ b/mojo/public/cpp/bindings/tests/BUILD.gn
@@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") +import("//build/nocompile.gni") import("//mojo/public/tools/bindings/mojom.gni") source_set("tests") { @@ -115,6 +116,17 @@ ] defines = [ "BLINK_MOJO_IMPL=1" ] } + + if (enable_nocompile_tests) { + deps += [ ":bindings_nocompile_tests" ] + } +} + +if (enable_nocompile_tests) { + nocompile_source_set("bindings_nocompile_tests") { + sources = [ "binder_map_nocompile.nc" ] + deps = [ "//mojo/public/cpp/bindings" ] + } } source_set("test_types") {
diff --git a/mojo/public/cpp/bindings/tests/binder_map_nocompile.nc b/mojo/public/cpp/bindings/tests/binder_map_nocompile.nc new file mode 100644 index 0000000..3cc8031 --- /dev/null +++ b/mojo/public/cpp/bindings/tests/binder_map_nocompile.nc
@@ -0,0 +1,32 @@ +// Copyright 2024 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This is a "no compile" test. It's not supposed to build. + +#include "mojo/public/cpp/bindings/binder_map.h" + +#include <string> + +namespace mojo { +namespace test { +namespace binder_map_unittest { + +void NonStaticString() { + { + std::string foo = "foo"; + auto static_str = internal::StaticString(foo.c_str()); // expected-error {{call to consteval function 'mojo::internal::StaticString::StaticString' is not a constant expression}} + } + { + const char kFoo[] = "foo"; + auto static_str = internal::StaticString(kFoo); // expected-error {{call to consteval function 'mojo::internal::StaticString::StaticString' is not a constant expression}} + } + { + constexpr char kFoo[] = "foo"; + auto static_str = internal::StaticString(kFoo); // expected-error {{call to consteval function 'mojo::internal::StaticString::StaticString' is not a constant expression}} + } +} + +} // namespace binder_map_unittest +} // namespace test +} // namespace mojo
diff --git a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc index 22f48d6..0750dee 100644 --- a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
@@ -64,6 +64,19 @@ mojo::Receiver<mojom::TestInterface2> receiver_{this}; }; +void Interface1Functor(mojo::PendingReceiver<mojom::TestInterface1> receiver) { + MakeSelfOwnedReceiver(std::make_unique<TestInterface1Impl>(), + std::move(receiver)); +} + +void Interface1Functor42( + int context, + mojo::PendingReceiver<mojom::TestInterface1> receiver) { + EXPECT_EQ(context, 42); + MakeSelfOwnedReceiver(std::make_unique<TestInterface1Impl>(), + std::move(receiver)); +} + TEST_F(BinderMapTest, NoMatch) { Remote<mojom::TestInterface1> remote; GenericPendingReceiver receiver(remote.BindNewPipeAndPassReceiver()); @@ -86,6 +99,18 @@ EXPECT_TRUE(remote.is_connected()); } +TEST_F(BinderMapTest, BasicMatchWithFunctor) { + Remote<mojom::TestInterface1> remote; + GenericPendingReceiver receiver(remote.BindNewPipeAndPassReceiver()); + + BinderMap map; + map.Add<mojom::TestInterface1>( + &Interface1Functor, base::SequencedTaskRunner::GetCurrentDefault()); + EXPECT_TRUE(map.TryBind(&receiver)); + remote.FlushForTesting(); + EXPECT_TRUE(remote.is_connected()); +} + TEST_F(BinderMapTest, WithContext) { Remote<mojom::TestInterface1> remote; GenericPendingReceiver receiver(remote.BindNewPipeAndPassReceiver()); @@ -105,6 +130,17 @@ EXPECT_TRUE(remote.is_connected()); } +TEST_F(BinderMapTest, FunctorWithContext) { + Remote<mojom::TestInterface1> remote; + GenericPendingReceiver receiver(remote.BindNewPipeAndPassReceiver()); + + BinderMapWithContext<int> map; + map.Add<mojom::TestInterface1>(&Interface1Functor42); + EXPECT_TRUE(map.TryBind(42, &receiver)); + remote.FlushForTesting(); + EXPECT_TRUE(remote.is_connected()); +} + TEST_F(BinderMapTest, CorrectSequence) { Remote<mojom::TestInterface1> remote1; GenericPendingReceiver receiver1(remote1.BindNewPipeAndPassReceiver());
diff --git a/mojo/public/tools/bindings/checks/mojom_attributes_check.py b/mojo/public/tools/bindings/checks/mojom_attributes_check.py index c856844..e1b7a42d 100644 --- a/mojo/public/tools/bindings/checks/mojom_attributes_check.py +++ b/mojo/public/tools/bindings/checks/mojom_attributes_check.py
@@ -222,6 +222,10 @@ raise check.CheckException( self.module, f"[Native] is not allowed on {full_name}; " "no new uses should be introduced") + if full_name in _NATIVE_ALLOWLIST and (not enum.attributes or + not 'Native' in enum.attributes): + raise check.CheckException( + self.module, f"{full_name} can be removed from _NATIVE_ALLOWLIST") for enumval in enum.fields: self._CheckAttributes("enum value", _ENUMVAL_ATTRIBUTES, enumval.attributes) @@ -246,12 +250,17 @@ def _CheckStructAttributes(self, struct): self._CheckAttributes("struct", _STRUCT_ATTRIBUTES, struct.attributes) + full_name = f"{self.module.mojom_namespace}.{struct.mojom_name}" if struct.attributes and 'Native' in struct.attributes: - full_name = f"{self.module.mojom_namespace}.{struct.mojom_name}" if full_name not in _NATIVE_ALLOWLIST: raise check.CheckException( self.module, f"[Native] is not allowed on {full_name}; " "no new uses should be introduced") + if full_name in _NATIVE_ALLOWLIST and (not struct.attributes or + not 'Native' in struct.attributes): + raise check.CheckException( + self.module, f"{full_name} can be removed from _NATIVE_ALLOWLIST") + for field in struct.fields: self._CheckAttributes("struct field", _STRUCT_FIELD_ATTRIBUTES, field.attributes)
diff --git a/net/BUILD.gn b/net/BUILD.gn index 19ed969b..483557d 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn
@@ -2179,6 +2179,8 @@ "test/embedded_test_server/websocket_check_origin_handler.h", "test/embedded_test_server/websocket_close_handler.cc", "test/embedded_test_server/websocket_close_handler.h", + "test/embedded_test_server/websocket_close_immediately_handler.cc", + "test/embedded_test_server/websocket_close_immediately_handler.h", "test/embedded_test_server/websocket_close_observer_handler.cc", "test/embedded_test_server/websocket_close_observer_handler.h", "test/embedded_test_server/websocket_connection.cc",
diff --git a/net/data/websocket/close-immediately_wsh.py b/net/data/websocket/close-immediately_wsh.py deleted file mode 100644 index eb3e19e..0000000 --- a/net/data/websocket/close-immediately_wsh.py +++ /dev/null
@@ -1,11 +0,0 @@ -# Copyright 2012 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -def web_socket_do_extra_handshake(_request): - pass # Always accept. - - -def web_socket_transfer_data(_request): - pass # Close immediately
diff --git a/net/data/websocket/send-message-every-quarter-second_wsh.py b/net/data/websocket/send-message-every-quarter-second_wsh.py deleted file mode 100644 index 1624cffd..0000000 --- a/net/data/websocket/send-message-every-quarter-second_wsh.py +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2023 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import six -import time - - -def web_socket_do_extra_handshake(request): - request.ws_extension_processors = [] - - -def web_socket_transfer_data(request): - while True: - message = request.ws_stream.receive_message() - - if message is None: - return - - # Send <message> count messages to the web socket, each a quarter second - # apart. - for i in range(int(message)): - request.ws_stream.send_message('ping', binary=False) - time.sleep(0.25)
diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc index 02d6dc0..62f3926 100644 --- a/net/http/http_proxy_connect_job.cc +++ b/net/http/http_proxy_connect_job.cc
@@ -29,6 +29,7 @@ #include "net/base/net_errors.h" #include "net/base/proxy_chain.h" #include "net/base/session_usage.h" +#include "net/base/task/task_runner.h" #include "net/dns/public/secure_dns_policy.h" #include "net/log/net_log_source_type.h" #include "net/log/net_log_with_source.h" @@ -406,9 +407,9 @@ // Always do this asynchronously, to avoid re-entrancy. next_state_ = STATE_RESTART_WITH_AUTH; - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( - FROM_HERE, base::BindOnce(&HttpProxyConnectJob::OnIOComplete, - weak_ptr_factory_.GetWeakPtr(), OK)); + net::GetTaskRunner(priority()) + ->PostTask(FROM_HERE, base::BindOnce(&HttpProxyConnectJob::OnIOComplete, + weak_ptr_factory_.GetWeakPtr(), OK)); } int HttpProxyConnectJob::DoLoop(int result) { @@ -631,8 +632,9 @@ int HttpProxyConnectJob::DoHttpProxyConnectComplete(int result) { // Always inform caller of auth requests asynchronously. if (result == ERR_PROXY_AUTH_REQUESTED) { - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( - FROM_HERE, base::BindOnce(&HttpProxyConnectJob::OnAuthChallenge, + net::GetTaskRunner(priority()) + ->PostTask(FROM_HERE, + base::BindOnce(&HttpProxyConnectJob::OnAuthChallenge, weak_ptr_factory_.GetWeakPtr())); return ERR_IO_PENDING; }
diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc index 3ade2a30..25e676b 100644 --- a/net/http/http_stream_factory_job.cc +++ b/net/http/http_stream_factory_job.cc
@@ -23,6 +23,7 @@ #include "net/base/proxy_chain.h" #include "net/base/proxy_delegate.h" #include "net/base/session_usage.h" +#include "net/base/task/task_runner.h" #include "net/base/url_util.h" #include "net/cert/cert_verifier.h" #include "net/dns/public/secure_dns_policy.h" @@ -530,7 +531,7 @@ RecordCompletionHistograms(result); if ((job_type_ == PRECONNECT) || (job_type_ == PRECONNECT_DNS_ALPN_H3)) { - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&HttpStreamFactory::Job::OnPreconnectsComplete, ptr_factory_.GetWeakPtr(), result)); @@ -543,7 +544,7 @@ GetSSLInfo(&ssl_info); next_state_ = STATE_WAITING_USER_ACTION; - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&HttpStreamFactory::Job::OnCertificateErrorCallback, ptr_factory_.GetWeakPtr(), result, ssl_info)); @@ -552,7 +553,7 @@ switch (result) { case ERR_SSL_CLIENT_AUTH_CERT_NEEDED: - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce( &Job::OnNeedsClientAuthCallback, ptr_factory_.GetWeakPtr(), @@ -563,31 +564,31 @@ next_state_ = STATE_DONE; if (is_websocket_) { DCHECK(websocket_stream_); - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&Job::OnWebSocketHandshakeStreamReadyCallback, ptr_factory_.GetWeakPtr())); } else if (stream_type_ == HttpStreamRequest::BIDIRECTIONAL_STREAM) { if (!bidirectional_stream_impl_) { - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&Job::OnStreamFailedCallback, ptr_factory_.GetWeakPtr(), ERR_FAILED)); } else { - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&Job::OnBidirectionalStreamImplReadyCallback, ptr_factory_.GetWeakPtr())); } } else { DCHECK(stream_.get()); - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&Job::OnStreamReadyCallback, ptr_factory_.GetWeakPtr())); } return; default: - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&Job::OnStreamFailedCallback, ptr_factory_.GetWeakPtr(), result)); return; @@ -742,7 +743,7 @@ !is_blocking_request_for_session) { net_log_.AddEvent(NetLogEventType::HTTP_STREAM_JOB_THROTTLED); next_state_ = STATE_INIT_CONNECTION; - base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( + GetTaskRunner(priority_)->PostDelayedTask( FROM_HERE, resume_callback, base::Milliseconds(kHTTP2ThrottleMs)); return ERR_IO_PENDING; }
diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc index 6233f71..214a5b7 100644 --- a/net/http/http_stream_factory_job_controller.cc +++ b/net/http/http_stream_factory_job_controller.cc
@@ -23,6 +23,7 @@ #include "net/base/proxy_chain.h" #include "net/base/proxy_string_util.h" #include "net/base/session_usage.h" +#include "net/base/task/task_runner.h" #include "net/base/url_util.h" #include "net/http/alternative_service.h" #include "net/http/bidirectional_stream_impl.h" @@ -612,7 +613,7 @@ resume_main_job_callback_.Reset( base::BindOnce(&HttpStreamFactory::JobController::ResumeMainJob, ptr_factory_.GetWeakPtr())); - base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( + net::GetTaskRunner(priority_)->PostDelayedTask( FROM_HERE, resume_main_job_callback_.callback(), delay); } @@ -756,7 +757,7 @@ DCHECK(!main_job_); DCHECK(!alternative_job_); DCHECK(!dns_alpn_h3_job_); - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + net::GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&HttpStreamFactory::JobController::NotifyRequestFailed, ptr_factory_.GetWeakPtr(), rv)); @@ -1522,7 +1523,7 @@ base::BindOnce(&JobController::OnPoolPreconnectsComplete, ptr_factory_.GetWeakPtr())); if (rv != ERR_IO_PENDING) { - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + net::GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&JobController::OnPoolPreconnectsComplete, ptr_factory_.GetWeakPtr(), rv)); } @@ -1536,7 +1537,7 @@ enable_ip_based_pooling_, enable_alternative_services_); // Delete `this` later as this method is called while running DoLoop(). - base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( + net::GetTaskRunner(priority_)->PostTask( FROM_HERE, base::BindOnce(&JobController::MaybeNotifyFactoryOfCompletion, ptr_factory_.GetWeakPtr())); }
diff --git a/net/quic/quic_session_pool_proxy_job_unittest.cc b/net/quic/quic_session_pool_proxy_job_unittest.cc index eb7506de..894044c 100644 --- a/net/quic/quic_session_pool_proxy_job_unittest.cc +++ b/net/quic/quic_session_pool_proxy_job_unittest.cc
@@ -436,7 +436,7 @@ // Drop the QuicSessionPool, destroying all pending requests. This should not // crash (see crbug.com/374777473). - factory_.reset(); + pool_.reset(); } TEST_P(QuicSessionPoolProxyJobTest, CreateProxySessionFails) { @@ -525,8 +525,8 @@ // Oops, the session went away. This generates an error // from `QuicSessionPool::CreateSessionOnProxyStream`. - factory_->CloseAllSessions(ERR_QUIC_HANDSHAKE_FAILED, - quic::QuicErrorCode::QUIC_INTERNAL_ERROR); + pool_->CloseAllSessions(ERR_QUIC_HANDSHAKE_FAILED, + quic::QuicErrorCode::QUIC_INTERNAL_ERROR); ASSERT_EQ(ERR_QUIC_HANDSHAKE_FAILED, callback_.WaitForResult());
diff --git a/net/quic/quic_session_pool_test.cc b/net/quic/quic_session_pool_test.cc index 863c6450..11191c7 100644 --- a/net/quic/quic_session_pool_test.cc +++ b/net/quic/quic_session_pool_test.cc
@@ -499,7 +499,7 @@ CompletionOnceCallback())); // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_FALSE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); @@ -546,17 +546,16 @@ quic_params_->max_server_configs_stored_in_properties = 1; quic_params_->idle_connection_timeout = base::Seconds(500); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); crypto_client_stream_factory_.set_handshake_mode( MockCryptoClientStream::ZERO_RTT); - const quic::QuicConfig* config = - QuicSessionPoolPeer::GetConfig(factory_.get()); + const quic::QuicConfig* config = QuicSessionPoolPeer::GetConfig(pool_.get()); EXPECT_EQ(500, config->IdleNetworkTimeout().ToSeconds()); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); const AlternativeService alternative_service1( NextProto::kProtoQUIC, kDefaultServerHostName, kDefaultServerPort); @@ -695,10 +694,10 @@ QuicSessionPool::QuicCryptoClientConfigKey key1(network_anonymization_key1); EXPECT_FALSE(QuicSessionPoolPeer::CryptoConfigCacheIsEmpty( - factory_.get(), quic_server_id1, key1)); + pool_.get(), quic_server_id1, key1)); std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle1 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), key1); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), key1); quic::QuicCryptoClientConfig::CachedState* cached = crypto_config_handle1->GetConfig()->LookupOrCreate(quic_server_id1); EXPECT_FALSE(cached->server_config().empty()); @@ -736,9 +735,9 @@ QuicSessionPool::QuicCryptoClientConfigKey key2(network_anonymization_key2); EXPECT_FALSE(QuicSessionPoolPeer::CryptoConfigCacheIsEmpty( - factory_.get(), quic_server_id2, key2)); + pool_.get(), quic_server_id2, key2)); std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), key2); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), key2); quic::QuicCryptoClientConfig::CachedState* cached2 = crypto_config_handle2->GetConfig()->LookupOrCreate(quic_server_id2); EXPECT_FALSE(cached2->server_config().empty()); @@ -836,7 +835,7 @@ base::test::ScopedFeatureList scoped_feature_list; scoped_feature_list.InitAndDisableFeature(net::features::kAsyncQuicSession); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); @@ -862,7 +861,7 @@ TEST_P(QuicSessionPoolTest, AsyncCreateZeroRtt) { Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); @@ -893,7 +892,7 @@ TEST_P(QuicSessionPoolTest, AsyncZeroRtt) { Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); @@ -963,7 +962,7 @@ EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); // Tearing down a QuicSessionPool with a pending Job should not cause any // crash. crbug.com/768343. - factory_.reset(); + pool_.reset(); } TEST_P(QuicSessionPoolTest, RequireConfirmation) { @@ -975,7 +974,7 @@ host_resolver_->rules()->AddIPLiteralRule(kDefaultServerHostName, "192.168.0.1", ""); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(false); + pool_->set_has_quic_ever_worked_on_current_network(false); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); @@ -1009,7 +1008,7 @@ host_resolver_->rules()->AddIPLiteralRule(kDefaultServerHostName, "192.168.0.1", ""); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(false); + pool_->set_has_quic_ever_worked_on_current_network(false); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); @@ -1044,7 +1043,7 @@ host_resolver_->rules()->AddIPLiteralRule(kDefaultServerHostName, "192.168.0.1", ""); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(false); + pool_->set_has_quic_ever_worked_on_current_network(false); http_server_properties_->SetLastLocalAddressWhenQuicWorked( IPAddress(192, 0, 2, 33)); @@ -1824,7 +1823,7 @@ std::unique_ptr<HttpStream> stream2 = CreateStream(&builder2.request); EXPECT_TRUE(stream2.get()); - factory_->OnSessionGoingAway(GetActiveSession(kDefaultDestination)); + pool_->OnSessionGoingAway(GetActiveSession(kDefaultDestination)); base::RunLoop().RunUntilIdle(); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_FALSE(HasActiveSession(server2)); @@ -2015,8 +2014,8 @@ // Mark the session as going away. Ensure that while it is still alive // that it is no longer active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - factory_->OnSessionGoingAway(session); - EXPECT_EQ(true, QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + pool_->OnSessionGoingAway(session); + EXPECT_EQ(true, QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); // Create a new request for the same destination and verify that a @@ -2029,7 +2028,7 @@ EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_NE(session, GetActiveSession(kDefaultDestination)); - EXPECT_EQ(true, QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_EQ(true, QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); stream2.reset(); stream.reset(); @@ -2269,8 +2268,8 @@ CompletionOnceCallback())); // Close the session and verify that stream saw the error. - factory_->CloseAllSessions(ERR_INTERNET_DISCONNECTED, - quic::QUIC_PEER_GOING_AWAY); + pool_->CloseAllSessions(ERR_INTERNET_DISCONNECTED, + quic::QUIC_PEER_GOING_AWAY); EXPECT_EQ(ERR_INTERNET_DISCONNECTED, stream->ReadResponseHeaders(callback_.callback())); @@ -2622,7 +2621,7 @@ // Check an active session exists for the destination. EXPECT_TRUE(HasActiveSession(kDefaultDestination)); QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(http_server_properties_->HasLastLocalAddressWhenQuicWorked()); // Change the IP address and verify that stream saw the error and the active @@ -2630,7 +2629,7 @@ NotifyIPAddressChanged(); EXPECT_EQ(ERR_NETWORK_CHANGED, stream->ReadResponseHeaders(callback_.callback())); - EXPECT_FALSE(factory_->has_quic_ever_worked_on_current_network()); + EXPECT_FALSE(pool_->has_quic_ever_worked_on_current_network()); EXPECT_FALSE(http_server_properties_->HasLastLocalAddressWhenQuicWorked()); // Check no active session exists for the destination. EXPECT_FALSE(HasActiveSession(kDefaultDestination)); @@ -2646,7 +2645,7 @@ // is no longer live. EXPECT_TRUE(HasActiveSession(kDefaultDestination)); QuicChromiumClientSession* session2 = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); stream.reset(); // Will reset stream 3. socket_data.ExpectAllReadDataConsumed(); @@ -2708,7 +2707,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -2722,7 +2721,7 @@ // The connection should still be alive, but marked as going away. EXPECT_FALSE(HasActiveSession(kDefaultDestination)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // Resume the data, response should be read from the original connection. @@ -2740,9 +2739,9 @@ // Check an active session exists for the destination. EXPECT_TRUE(HasActiveSession(kDefaultDestination)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); QuicChromiumClientSession* session2 = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); stream.reset(); stream2.reset(); @@ -2792,7 +2791,7 @@ // Change the IP address and verify that the connection is unaffected. NotifyIPAddressChanged(); - EXPECT_TRUE(factory_->has_quic_ever_worked_on_current_network()); + EXPECT_TRUE(pool_->has_quic_ever_worked_on_current_network()); EXPECT_TRUE(http_server_properties_->HasLastLocalAddressWhenQuicWorked()); // Attempting a new request to the same origin uses the same connection. @@ -2826,7 +2825,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -2900,7 +2899,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -2927,7 +2926,7 @@ task_runner->RunUntilIdle(); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -2937,7 +2936,7 @@ // will be posted to complete migration. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -2949,7 +2948,7 @@ EXPECT_EQ(200, response.headers->response_code()); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -2978,7 +2977,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -3063,7 +3062,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -3100,7 +3099,7 @@ quic_data2.Resume(); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -3116,7 +3115,7 @@ base::RunLoop().RunUntilIdle(); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -3140,7 +3139,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -3164,7 +3163,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Trigger connection migration. Since there are no networks @@ -3173,7 +3172,7 @@ ->NotifyNetworkDisconnected(kDefaultNetworkForTests); // The migration will not fail until the migration alarm timeout. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -3184,7 +3183,7 @@ // The connection should now be closed. A request for response // headers should fail. - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(ERR_INTERNET_DISCONNECTED, callback_.WaitForResult()); @@ -3303,7 +3302,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -3313,14 +3312,14 @@ scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkMadeDefault(kNewNetworkForTests); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // Resume data to read a connectivity probing response, which will cause // non-migtable streams to be closed. quic_data1.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(migrate_idle_sessions, HasActiveSession(kDefaultDestination)); EXPECT_EQ(0u, session->GetNumActiveStreams()); @@ -3372,7 +3371,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Set session config to have connection migration disabled. @@ -3386,7 +3385,7 @@ ->NotifyNetworkMadeDefault(kNewNetworkForTests); base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -3497,7 +3496,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -3510,7 +3509,7 @@ ->NotifyNetworkDisconnected(kDefaultNetworkForTests); EXPECT_EQ(migrate_idle_sessions, - QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(migrate_idle_sessions, HasActiveSession(kDefaultDestination)); if (migrate_idle_sessions) { @@ -3554,7 +3553,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Set session config to have connection migration disabled. @@ -3566,7 +3565,7 @@ scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkDisconnected(kDefaultNetworkForTests); - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); socket_data.ExpectAllReadDataConsumed(); @@ -3645,7 +3644,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_FALSE(session->HasActiveRequestStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -3761,7 +3760,7 @@ client_maker_.set_save_packet_frames(true); // Use the test task runner. - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); int packet_number = 1; MockQuicData socket_data(version_); @@ -3797,7 +3796,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -3847,13 +3846,13 @@ ->NotifyNetworkDisconnected(kDefaultNetworkForTests); base::RunLoop().RunUntilIdle(); // The connection should still be alive, not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); // Ensure that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -3866,7 +3865,7 @@ EXPECT_EQ(200, response.headers->response_code()); // Check that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // There should be posted tasks not executed, which is to migrate back to @@ -3908,7 +3907,7 @@ EXPECT_TRUE(proxy_chain.IsValid()); // Use the test task runner. - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); // Use a separate packet maker for the connection to the endpoint. QuicTestPacketMaker to_endpoint_maker( @@ -3995,14 +3994,13 @@ GetActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain); EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); // Ensure that the session to the proxy is alive and active. QuicChromiumClientSession* proxy_session = GetActiveSession( proxy_origin, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), ProxyChain::ForIpProtection({}), SessionUsage::kProxy); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, proxy_session); @@ -4052,12 +4050,11 @@ // Both sessions should still be alive, not marked as going away. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain)); EXPECT_EQ(1u, destination_session->GetNumActiveStreams()); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); EXPECT_EQ(1u, proxy_session->GetNumActiveStreams()); // Begin reading the response, which only appears on the new connection, @@ -4066,12 +4063,11 @@ // Ensure that the session to the destination is still alive. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain)); EXPECT_EQ(1u, destination_session->GetNumActiveStreams()); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); EXPECT_EQ(1u, proxy_session->GetNumActiveStreams()); // Run the message loop so that data queued in the new socket is read by the @@ -4085,9 +4081,8 @@ // Check that the sessions are still alive. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); // There should be posted tasks not executed, which is to migrate back to // default network. @@ -4120,7 +4115,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); GURL proxy(kProxy1Url); auto proxy_origin = url::SchemeHostPort(proxy); @@ -4215,14 +4210,13 @@ GetActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain); EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); // Ensure that the session to the proxy is alive and active. QuicChromiumClientSession* proxy_session = GetActiveSession( proxy_origin, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), ProxyChain::ForIpProtection({}), SessionUsage::kProxy); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, proxy_session); @@ -4276,22 +4270,21 @@ socket_factory_->AddSocketDataProvider(&socket_data1); // Trigger connection migration. - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to both sessions. // The destination session will start to probe the alternate network. destination_session->connection()->OnPathDegradingDetected(); proxy_session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Both sessions should still be alive, not marked as going away. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain)); EXPECT_EQ(1u, destination_session->GetNumActiveStreams()); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); EXPECT_EQ(1u, proxy_session->GetNumActiveStreams()); // Begin reading the response, which only appears on the new connection, @@ -4300,12 +4293,11 @@ // Ensure that the session to the destination is still alive. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination, PRIVACY_MODE_DISABLED, NetworkAnonymizationKey(), proxy_chain)); EXPECT_EQ(1u, destination_session->GetNumActiveStreams()); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); EXPECT_EQ(1u, proxy_session->GetNumActiveStreams()); // There should be a task that will complete the migration to the new network. @@ -4323,9 +4315,8 @@ // Check that the sessions are still alive. EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), destination_session)); - EXPECT_TRUE( - QuicSessionPoolPeer::IsLiveSession(factory_.get(), proxy_session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), destination_session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), proxy_session)); // Migration back to the default network has begun, so there are no more // posted tasks. @@ -4348,7 +4339,7 @@ client_maker_.set_save_packet_frames(true); // Use the test task runner. - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -4380,7 +4371,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -4398,7 +4389,7 @@ ->NotifyNetworkDisconnected(kDefaultNetworkForTests); // The connection should still be alive, not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -4439,7 +4430,7 @@ ->NotifyNetworkConnected(kNewNetworkForTests); // Ensure that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -4452,7 +4443,7 @@ EXPECT_EQ(200, response.headers->response_code()); // Check that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // There should posted tasks not executed, which is to migrate back to default @@ -4486,7 +4477,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -4571,7 +4562,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -4581,15 +4572,15 @@ EXPECT_EQ(OK, stream->SendRequest(request_headers, &response, callback_.callback())); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe the alternate network. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -4598,14 +4589,14 @@ // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // There should be a task that will complete the migration to the new network. task_runner->RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Response headers are received over the new network. EXPECT_THAT(callback_.WaitForResult(), IsOk()); @@ -4616,12 +4607,12 @@ scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkMadeDefault(kNewNetworkForTests); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); task_runner->FastForwardBy(base::Seconds(kMinRetryTimeForDefaultNetworkSecs)); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -4656,7 +4647,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -4737,7 +4728,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -4751,15 +4742,15 @@ session->connection()->SendPing(); } - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe the alternate network. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -4768,32 +4759,32 @@ // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // There should be a task that will complete the migration to the new network. task_runner->RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Response headers are received over the new network. EXPECT_THAT(callback_.WaitForResult(), IsOk()); EXPECT_EQ(200, response.headers->response_code()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Deliver a signal that the alternate network now becomes default to session, // this will cancel mgirate back to default network timer. scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkMadeDefault(kNewNetworkForTests); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); task_runner->FastForwardBy(base::Seconds(kMinRetryTimeForDefaultNetworkSecs)); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -4812,7 +4803,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -4875,7 +4866,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -4885,17 +4876,17 @@ EXPECT_EQ(OK, stream->SendRequest(request_headers, &response, callback_.callback())); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe the alternate network. // However, the probing writer will fail. This should result in a failed probe // but no connection close. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -4910,14 +4901,14 @@ // Verify that path validation is cancelled. EXPECT_FALSE(session->connection()->HasPendingPathValidation()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); quic_data1.Resume(); // Response headers are received on the original network.. EXPECT_THAT(callback_.WaitForResult(), IsOk()); EXPECT_EQ(200, response.headers->response_code()); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -4937,7 +4928,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -5007,7 +4998,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_path2, session); base::RunLoop().RunUntilIdle(); @@ -5017,17 +5008,17 @@ EXPECT_EQ(OK, stream->SendRequest(request_headers, &response, callback_.callback())); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe the alternate network. // However, the probing writer will fail. This should result in a failed probe // but no connection close. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -5051,7 +5042,7 @@ // No pending path validation as there is no connection ID available. EXPECT_FALSE(session->connection()->HasPendingPathValidation()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); quic_data1.Resume(); // Response headers are received on the original network.. EXPECT_THAT(callback_.WaitForResult(), IsOk()); @@ -5059,7 +5050,7 @@ base::RunLoop().RunUntilIdle(); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); base::RunLoop().RunUntilIdle(); stream.reset(); @@ -5080,7 +5071,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData quic_data1(version_); quic_data1.AddReadPauseForever(); @@ -5156,7 +5147,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Manually initialize the connection's self address. In real life, the // initialization will be done during crypto handshake. @@ -5187,7 +5178,7 @@ // socket. This makes the multi-port path ready to migrate. quic_data2.Resume(); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start migrate to multi-port path immediately. @@ -5195,7 +5186,7 @@ base::RunLoop().RunUntilIdle(); // The connection should still be degrading because no new packets are // received from the new path. - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The response is received on the new path. quic_data2.Resume(); @@ -5204,7 +5195,7 @@ task_runner->RunUntilIdle(); base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -5212,7 +5203,7 @@ quic_data2.Resume(); task_runner->RunUntilIdle(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); stream.reset(); task_runner->RunUntilIdle(); @@ -5463,7 +5454,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); IPEndPoint actual_address; @@ -5538,7 +5529,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -5555,7 +5546,7 @@ EXPECT_TRUE(chrome_stream); chrome_stream->DisableConnectionMigrationToCellularNetwork(); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Manually initialize the connection's self address. In real life, the // initialization will be done during crypto handshake. @@ -5575,8 +5566,8 @@ base::RunLoop().RunUntilIdle(); // The session should stay alive as if nothing happened. - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -5595,7 +5586,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_number = 1; MockQuicData quic_data1(version_); @@ -5652,7 +5643,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -5669,17 +5660,17 @@ quic::test::QuicConnectionPeer::SetSelfAddress(session->connection(), ToQuicSocketAddress(ip)); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe a different port. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -5687,10 +5678,10 @@ // Resume quic data and a STATELESS_RESET is read from the probing path. quic_data2.Resume(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Verify that the session is still active, and the request stream is active. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -5876,7 +5867,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -5892,7 +5883,7 @@ EXPECT_THAT(callback_.WaitForResult(), IsOk()); QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); crypto_client_stream_factory_.last_stream()->setHandshakeConfirmedForce( @@ -5931,7 +5922,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -5956,7 +5947,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_FALSE(session->HasActiveRequestStreams()); @@ -5993,7 +5984,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -6030,7 +6021,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -6070,7 +6061,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -6107,7 +6098,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -6149,7 +6140,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -6181,7 +6172,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -6250,7 +6241,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -6260,9 +6251,9 @@ callback_.callback())); std::unique_ptr<DatagramClientSocket> socket( - factory_->CreateSocket(net_log_.net_log(), net_log_.source())); + pool_->CreateSocket(net_log_.net_log(), net_log_.source())); DatagramClientSocket* socket_ptr = socket.get(); - factory_->ConnectAndConfigureSocket( + pool_->ConnectAndConfigureSocket( base::BindLambdaForTesting([&session, &socket](int rv) { session->CloseSessionOnErrorLater( 0, quic::QUIC_TOO_MANY_RTOS, @@ -6300,7 +6291,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_num = 1; MockQuicData quic_data(version_); @@ -6359,7 +6350,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); // Send GET request on stream. @@ -6434,7 +6425,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_number = 1; MockQuicData quic_data1(version_); @@ -6509,7 +6500,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -6527,7 +6518,7 @@ EXPECT_TRUE(chrome_stream); chrome_stream->DisableConnectionMigrationToCellularNetwork(); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Manually initialize the connection's self address. In real life, the // initialization will be done during crypto handshake. @@ -6541,7 +6532,7 @@ session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // There should be one pending task as the probe posted a DoNothingAs // callback. @@ -6549,7 +6540,7 @@ task_runner->ClearPendingTasks(); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -6558,12 +6549,12 @@ // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // Successful port migration causes the path no longer degrading on the same // network. - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // There should be pending tasks, the nearest one will complete // migration to the new port. @@ -6576,7 +6567,7 @@ EXPECT_THAT(callback_.WaitForResult(), IsOk()); EXPECT_EQ(200, response.headers->response_code()); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Now there may be one pending task to send connectivity probe that has been // cancelled due to successful migration. @@ -6584,7 +6575,7 @@ // Verify that the session is still alive, and the request stream is still // alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); chrome_stream = static_cast<QuicChromiumClientStream*>( quic::test::QuicSessionPeer::GetStream( @@ -6608,7 +6599,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_number = 1; MockQuicData quic_data1(version_); @@ -6640,7 +6631,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -6727,20 +6718,20 @@ quic_data2.AddReadPauseForever(); quic_data2.AddSocketDataToFactory(socket_factory_.get()); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe a different port. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The retry mechanism is internal to path validator. EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -6749,7 +6740,7 @@ quic_data2.Resume(); base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -6773,7 +6764,7 @@ } // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -6804,7 +6795,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); int packet_number = 1; MockQuicData quic_data1(version_); @@ -6874,7 +6865,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -6892,7 +6883,7 @@ EXPECT_TRUE(chrome_stream); chrome_stream->DisableConnectionMigrationToCellularNetwork(); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Manually initialize the connection's self address. In real life, the // initialization will be done during crypto handshake. @@ -6915,7 +6906,7 @@ EXPECT_EQ(200, response.headers->response_code()); EXPECT_EQ(0u, session->GetNumActiveStreams()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // There should be one pending task as the probe posted a DoNothingAs // callback. @@ -6923,18 +6914,18 @@ task_runner->ClearPendingTasks(); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Resume quic data and a connectivity probe response will be read on the new // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Successful port migration causes the path no longer degrading on the same // network. - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // There should be pending tasks, the nearest one will complete // migration to the new port. @@ -6948,7 +6939,7 @@ task_runner->FastForwardUntilNoTasksRemain(); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic_data1.ExpectAllReadDataConsumed(); @@ -6968,7 +6959,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -7025,7 +7016,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -7034,15 +7025,15 @@ EXPECT_EQ(OK, stream->SendRequest(request_headers, &response, callback_.callback())); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will start to probe the alternate network. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -7056,7 +7047,7 @@ EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -7093,7 +7084,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -7169,7 +7160,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -7184,22 +7175,22 @@ base::RunLoop().RunUntilIdle(); EXPECT_EQ(0u, session->GetNumActiveStreams()); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session should still start to probe the alternate network. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); // Resume quic data and a connectivity probe response will be read on the new // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(0u, session->GetNumActiveStreams()); EXPECT_TRUE(session->HasActiveRequestStreams()); @@ -7215,7 +7206,7 @@ task_runner->FastForwardBy(base::Seconds(kMinRetryTimeForDefaultNetworkSecs)); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(OK, stream->ReadResponseHeaders(callback_.callback())); @@ -7238,7 +7229,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); scoped_mock_network_change_notifier_->mock_network_change_notifier() ->QueueNetworkMadeDefault(kDefaultNetworkForTests); @@ -7316,7 +7307,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -7326,18 +7317,18 @@ EXPECT_EQ(OK, stream->SendRequest(request_headers, &response, callback_.callback())); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Due to lack of alternate network, session will not mgirate connection. EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Deliver a signal that a alternate network is connected now, this should // cause the connection to start early migration on path degrading. @@ -7348,7 +7339,7 @@ ->NotifyNetworkConnected(kNewNetworkForTests); // The connection should still be alive, and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -7357,7 +7348,7 @@ // socket. quic_data2.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -7366,7 +7357,7 @@ // Although the session successfully migrates, it is still considered // degrading sessions. - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Response headers are received over the new network. EXPECT_THAT(callback_.WaitForResult(), IsOk()); @@ -7381,7 +7372,7 @@ task_runner->FastForwardBy(base::Seconds(kMinRetryTimeForDefaultNetworkSecs)); // Verify that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); stream.reset(); @@ -7476,8 +7467,8 @@ ->NotifyNetworkDisconnected(kDefaultNetworkForTests); // Ensure that both sessions are paused but alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session1)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session1)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); // Add new sockets to use post migration. Those are bad sockets and will cause // migration to fail. @@ -7497,8 +7488,8 @@ scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkConnected(kNewNetworkForTests); - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session1)); - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session1)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); socket_data1.ExpectAllReadDataConsumed(); socket_data1.ExpectAllWriteDataConsumed(); @@ -7566,7 +7557,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. @@ -7578,21 +7569,21 @@ // Trigger connection migration on path degrading. Since there are no networks // to migrate to, the session will remain on the original network, not marked // as going away. - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(session->connection()->IsPathDegrading()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); // Resume so that rest of the data will flow in the original socket. quic_data.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -7708,7 +7699,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -7779,7 +7770,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Set session config to have connection migration disabled. @@ -7795,7 +7786,7 @@ // packet reader. base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -7821,7 +7812,7 @@ // Using a testing task runner so that we can control time. // base::RunLoop() controls mocked socket writes and reads. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -7917,7 +7908,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -7948,7 +7939,7 @@ base::RunLoop().RunUntilIdle(); // Verify the session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); // There should be one task posted to migrate back to the default network in @@ -7989,7 +7980,7 @@ // Using a testing task runner so that we can control time. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -8054,7 +8045,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid1, session); @@ -8078,7 +8069,7 @@ base::RunLoop().RunUntilIdle(); // Verify the session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // There should be one task posted to migrate back to the default network in @@ -8133,7 +8124,7 @@ task_runner->FastForwardBy(expected_delay); // Verify the session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -8142,7 +8133,7 @@ task_runner->FastForwardUntilNoTasksRemain(); // Verify the session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -8166,7 +8157,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); // Use cold start mode to send crypto message for handshake. crypto_client_stream_factory_.set_handshake_mode( @@ -8187,16 +8178,16 @@ EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); QuicChromiumClientSession* session = GetPendingSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); // Cause the connection to report path degrading to the session. // Session will ignore the signal as handshake is not completed. - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); @@ -8226,7 +8217,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); // Use cold start mode to send crypto message for handshake. crypto_client_stream_factory_.set_handshake_mode( @@ -8247,15 +8238,15 @@ EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); QuicChromiumClientSession* session = GetPendingSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); - EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(0u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); // Cause the connection to report path degrading to the session. // Session will ignore the signal as handshake is not completed. session->connection()->OnPathDegradingDetected(); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(factory_.get())); + EXPECT_EQ(1u, QuicSessionPoolPeer::GetNumDegradingSessions(pool_.get())); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); @@ -8320,7 +8311,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); // Use cold start mode to send crypto message for handshake. crypto_client_stream_factory_.set_handshake_mode( @@ -8387,7 +8378,7 @@ EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); QuicChromiumClientSession* session = GetPendingSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(0u, task_runner->GetPendingTaskCount()); EXPECT_FALSE(failed_on_default_network_); @@ -8585,7 +8576,7 @@ EXPECT_TRUE(HasActiveJob(kDefaultDestination, PRIVACY_MODE_DISABLED)); base::RunLoop().RunUntilIdle(); QuicChromiumClientSession* session = GetPendingSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); // Confirm the handshake on the alternate network. crypto_client_stream_factory_.last_stream() @@ -8662,7 +8653,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -8716,7 +8707,7 @@ base::RunLoop().RunUntilIdle(); // Verify that session is alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -8748,7 +8739,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); // Use the test task runner, to force the migration alarm timeout later. - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -8775,7 +8766,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Send GET request on stream. This causes a write error, which triggers @@ -8796,13 +8787,13 @@ } // Migration has not yet failed. The session should be alive and active. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_TRUE(session->connection()->writer()->IsWriteBlocked()); // The migration will not fail until the migration alarm timeout. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -8812,7 +8803,7 @@ // The connection should be closed. A request for response headers // should fail. - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(ERR_NETWORK_CHANGED, callback_.WaitForResult()); EXPECT_EQ(ERR_NETWORK_CHANGED, @@ -8948,7 +8939,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -8965,7 +8956,7 @@ base::RunLoop().RunUntilIdle(); // Verify session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); @@ -9099,7 +9090,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -9117,7 +9108,7 @@ // Verify that the session is still alive and not marked as going away. // Non-migratable stream should be closed due to migration. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -9257,7 +9248,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(2u, session->GetNumActiveStreams()); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -9274,7 +9265,7 @@ // still alive and not marked as going away, non-migratable stream will be // closed. base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -9381,7 +9372,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -9399,7 +9390,7 @@ // if migrate idle session is enabled, it migrates to the alternate network // successfully; otherwise the connection is closed. EXPECT_EQ(migrate_idle_sessions, - QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_EQ(migrate_idle_sessions, HasActiveSession(kDefaultDestination)); if (migrate_idle_sessions) { @@ -9464,7 +9455,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Set session config to have connection migration disabled. @@ -9481,7 +9472,7 @@ // Run message loop to execute migration attempt. base::RunLoop().RunUntilIdle(); // Migration fails, and session is closed and deleted. - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); socket_data.ExpectAllReadDataConsumed(); socket_data.ExpectAllWriteDataConsumed(); @@ -9565,7 +9556,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); MaybeMakeNewConnectionIdAvailableToSession(cid_on_new_path, session); @@ -9580,7 +9571,7 @@ base::RunLoop().RunUntilIdle(); // Connection is closed as there is no connection ID available yet for the // second migration. - EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_FALSE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); stream.reset(); socket_data1.ExpectAllReadDataConsumed(); socket_data1.ExpectAllWriteDataConsumed(); @@ -9690,7 +9681,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -9753,7 +9744,7 @@ base::RunLoop().RunUntilIdle(); // Verify the session is still alive and not marked as going away post // migration. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); // Verify that response headers on the migrated socket were delivered to the @@ -9842,7 +9833,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -9906,7 +9897,7 @@ } // Verify session is still alive and not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -9972,7 +9963,7 @@ client_maker_.set_save_packet_frames(true); // Use the test task runner. - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -10001,7 +9992,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10014,7 +10005,7 @@ callback_.callback())); // The connection should still be alive, not marked as going away. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -10063,7 +10054,7 @@ ->NotifyNetworkConnected(kNewNetworkForTests); // Ensure that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10075,7 +10066,7 @@ EXPECT_EQ(200, response.headers->response_code()); // Check that the session is still alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // There should be no posted tasks not executed, no way to migrate back to @@ -10117,7 +10108,7 @@ // Using a testing task runner so that we can verify whether the migrate on // write error task is posted. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); int packet_num = 1; @@ -10150,7 +10141,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10201,7 +10192,7 @@ task_runner->RunUntilIdle(); EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10234,7 +10225,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); int packet_num = 1; @@ -10263,7 +10254,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10316,7 +10307,7 @@ task_runner->RunUntilIdle(); EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10336,7 +10327,7 @@ // packet reader. Verify that the session is not affected. socket_data.Resume(); EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10360,7 +10351,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); int packet_num = 1; @@ -10389,7 +10380,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10443,7 +10434,7 @@ // packet reader. Verify that the session is not affected. socket_data.Resume(); EXPECT_EQ(2u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10451,7 +10442,7 @@ task_runner->RunUntilIdle(); EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10486,10 +10477,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10597,7 +10588,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10625,7 +10616,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. socket_data.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10651,10 +10642,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -10761,7 +10752,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10789,7 +10780,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. socket_data.Resume(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10813,10 +10804,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); MockQuicData socket_data1(version_); int packet_num = 1; @@ -10886,7 +10877,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10913,7 +10904,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -10942,10 +10933,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); MockQuicData socket_data1(version_); int packet_num = 1; @@ -11011,7 +11002,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11040,7 +11031,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11064,10 +11055,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); MockQuicData socket_data1(version_); int packet_num = 1; @@ -11137,7 +11128,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11164,7 +11155,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11195,10 +11186,10 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); QuicSessionPoolPeer::SetAlarmFactory( - factory_.get(), std::make_unique<QuicChromiumAlarmFactory>( - task_runner.get(), context_.clock())); + pool_.get(), std::make_unique<QuicChromiumAlarmFactory>( + task_runner.get(), context_.clock())); MockQuicData socket_data1(version_); int packet_num = 1; @@ -11264,7 +11255,7 @@ // Complete migration. task_runner->RunUntilIdle(); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11293,7 +11284,7 @@ // Resume the old socket data, a read error will be delivered to the old // packet reader. Verify that the session is not affected. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11316,7 +11307,7 @@ // Using a testing task runner. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); MockQuicData socket_data(version_); int packet_num = 1; @@ -11345,7 +11336,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -11381,7 +11372,7 @@ // There will be one pending task to complete migration on write error. // Verify session is not closed with read error. EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11390,7 +11381,7 @@ // There will be one more task posted attempting to migrate back to the // default network. EXPECT_EQ(1u, task_runner->GetPendingTaskCount()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11491,7 +11482,7 @@ // Ensure that session is alive and active. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); quic::QuicConnectionId cid_on_new_path = quic::test::TestConnectionId(12345678); @@ -11509,7 +11500,7 @@ // In this particular code path, the network will not yet be marked // as going away and the session will still be alive. - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); EXPECT_EQ(ERR_IO_PENDING, stream->ReadResponseHeaders(callback_.callback())); @@ -11568,7 +11559,7 @@ scoped_mock_network_change_notifier_->mock_network_change_notifier() ->NotifyNetworkDisconnected(kDefaultNetworkForTests); } - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_EQ(1u, session->GetNumActiveStreams()); @@ -11613,8 +11604,8 @@ // Using a testing task runner and a test tick tock. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); - QuicSessionPoolPeer::SetTickClock(factory_.get(), + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTickClock(pool_.get(), task_runner->GetMockTickClock()); quic::QuicConnectionId cid1 = quic::test::TestConnectionId(1234567); @@ -11834,8 +11825,8 @@ // Using a testing task runner and a test tick tock. auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>(); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), task_runner.get()); - QuicSessionPoolPeer::SetTickClock(factory_.get(), + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), task_runner.get()); + QuicSessionPoolPeer::SetTickClock(pool_.get(), task_runner->GetMockTickClock()); quic::QuicConnectionId cid1 = quic::test::TestConnectionId(1234567); @@ -12040,8 +12031,8 @@ CertDatabase::GetInstance()->NotifyObserversTrustStoreChanged(); base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(factory_->has_quic_ever_worked_on_current_network()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(pool_->has_quic_ever_worked_on_current_network()); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); // Now attempting to request a stream to the same origin should create @@ -12056,8 +12047,8 @@ QuicChromiumClientSession* session2 = GetActiveSession(kDefaultDestination); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_NE(session, session2); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); stream2.reset(); stream.reset(); @@ -12098,8 +12089,8 @@ cert_verifier_->SimulateOnCertVerifierChanged(); base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(factory_->has_quic_ever_worked_on_current_network()); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(pool_->has_quic_ever_worked_on_current_network()); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_FALSE(HasActiveSession(kDefaultDestination)); // Now attempting to request a stream to the same origin should create @@ -12114,8 +12105,8 @@ QuicChromiumClientSession* session2 = GetActiveSession(kDefaultDestination); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); EXPECT_NE(session, session2); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session2)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session2)); stream2.reset(); stream.reset(); @@ -12144,7 +12135,7 @@ // QuicCryptoClientConfig alive. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); quic::QuicServerId server_id1(scheme_host_port1.host(), scheme_host_port1.port()); quic::QuicCryptoClientConfig::CachedState* cached1 = @@ -12184,7 +12175,7 @@ // QuicCryptoClientConfig alive. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); quic::QuicServerId server_id1(scheme_host_port1.host(), scheme_host_port1.port()); quic::QuicCryptoClientConfig::CachedState* cached1 = @@ -12210,11 +12201,11 @@ TEST_P(QuicSessionPoolTest, EnableNotLoadFromDiskCache) { Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -12249,7 +12240,7 @@ crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); MockQuicData socket_data(version_); socket_data.AddReadPauseForever(); @@ -12275,7 +12266,7 @@ // Quic should use default PING timeout when no previous connection times out // with open stream. EXPECT_EQ(quic::QuicTime::Delta::FromSeconds(quic::kPingTimeoutSecs), - QuicSessionPoolPeer::GetPingTimeout(factory_.get())); + QuicSessionPoolPeer::GetPingTimeout(pool_.get())); RequestBuilder builder(this); EXPECT_EQ(ERR_IO_PENDING, builder.CallRequest()); EXPECT_THAT(callback_.WaitForResult(), IsOk()); @@ -12304,7 +12295,7 @@ // The first connection times out with open stream, QUIC should reduce initial // PING time for subsequent connections. EXPECT_EQ(quic::QuicTime::Delta::FromSeconds(10), - QuicSessionPoolPeer::GetPingTimeout(factory_.get())); + QuicSessionPoolPeer::GetPingTimeout(pool_.get())); // Test two-in-a-row timeouts with open streams. DVLOG(1) << "Create 2nd session and timeout with open stream"; @@ -12384,7 +12375,7 @@ // Create a QuicCryptoClientConfigHandle for kNetworkAnonymizationKey1, and // set the user agent. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle1 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey1); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey1); crypto_config_handle1->GetConfig()->set_user_agent_id(kUserAgentId); EXPECT_EQ(kUserAgentId, crypto_config_handle1->GetConfig()->user_agent_id()); @@ -12392,7 +12383,7 @@ // NetworkAnonymizationKey while the first one is still alive should return // the same config, with the user agent that was just set. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey2); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey2); EXPECT_EQ(kUserAgentId, crypto_config_handle2->GetConfig()->user_agent_id()); // Destroying both handles and creating a new one with yet another @@ -12401,7 +12392,7 @@ crypto_config_handle2.reset(); std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle3 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey3); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey3); EXPECT_EQ(kUserAgentId, crypto_config_handle3->GetConfig()->user_agent_id()); } @@ -12439,7 +12430,7 @@ // Create a QuicCryptoClientConfigHandle for kNetworkAnonymizationKey1, and // set the user agent. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle1 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey1); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey1); crypto_config_handle1->GetConfig()->set_user_agent_id(kUserAgentId1); EXPECT_EQ(kUserAgentId1, crypto_config_handle1->GetConfig()->user_agent_id()); @@ -12447,7 +12438,7 @@ // NetworkAnonymizationKey while the first one is still alive should return a // different config. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey2); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey2); EXPECT_EQ("", crypto_config_handle2->GetConfig()->user_agent_id()); crypto_config_handle2->GetConfig()->set_user_agent_id(kUserAgentId2); EXPECT_EQ(kUserAgentId1, crypto_config_handle1->GetConfig()->user_agent_id()); @@ -12456,9 +12447,9 @@ // Creating handles with the same NAKs while the old handles are still alive // should result in getting the same CryptoConfigs. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle1_2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey1); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey1); std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle2_2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey2); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey2); EXPECT_EQ(kUserAgentId1, crypto_config_handle1_2->GetConfig()->user_agent_id()); EXPECT_EQ(kUserAgentId2, @@ -12472,7 +12463,7 @@ crypto_config_handle2_2.reset(); std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle3 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey3); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey3); EXPECT_EQ("", crypto_config_handle3->GetConfig()->user_agent_id()); crypto_config_handle3->GetConfig()->set_user_agent_id(kUserAgentId3); EXPECT_EQ(kUserAgentId3, crypto_config_handle3->GetConfig()->user_agent_id()); @@ -12481,11 +12472,11 @@ // The old CryptoConfigs should be recovered when creating handles with the // same NAKs as before. crypto_config_handle2 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey2); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey2); crypto_config_handle1 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey1); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey1); crypto_config_handle3 = - QuicSessionPoolPeer::GetCryptoConfig(factory_.get(), kKey3); + QuicSessionPoolPeer::GetCryptoConfig(pool_.get(), kKey3); EXPECT_EQ(kUserAgentId1, crypto_config_handle1->GetConfig()->user_agent_id()); EXPECT_EQ(kUserAgentId2, crypto_config_handle2->GetConfig()->user_agent_id()); EXPECT_EQ(kUserAgentId3, crypto_config_handle3->GetConfig()->user_agent_id()); @@ -12515,8 +12506,8 @@ std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey( - network_anonymization_keys[i])); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey( + network_anonymization_keys[i])); crypto_config_handle->GetConfig()->set_user_agent_id( base::NumberToString(i)); crypto_config_handles.emplace_back(std::move(crypto_config_handle)); @@ -12531,8 +12522,8 @@ // A new handle for the same NAK returns the same crypto config. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey( - network_anonymization_keys[i])); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey( + network_anonymization_keys[i])); EXPECT_EQ(base::NumberToString(i), crypto_config_handle->GetConfig()->user_agent_id()); } @@ -12550,8 +12541,8 @@ // evicted. Otherwise, it will return the same one. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey( - network_anonymization_keys[i])); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey( + network_anonymization_keys[i])); if (kNumSessionsToMake - i > kNumSessionsToMake) { EXPECT_EQ("", crypto_config_handle->GetConfig()->user_agent_id()); } else { @@ -12587,11 +12578,10 @@ quic_params_->max_server_configs_stored_in_properties = 1; quic_params_->idle_connection_timeout = base::Seconds(500); Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); crypto_client_stream_factory_.set_handshake_mode( MockCryptoClientStream::ZERO_RTT); - const quic::QuicConfig* config = - QuicSessionPoolPeer::GetConfig(factory_.get()); + const quic::QuicConfig* config = QuicSessionPoolPeer::GetConfig(pool_.get()); EXPECT_EQ(500, config->IdleNetworkTimeout().ToSeconds()); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); @@ -12599,7 +12589,7 @@ SCOPED_TRACE(i); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); - QuicSessionPoolPeer::SetTaskRunner(factory_.get(), runner_.get()); + QuicSessionPoolPeer::SetTaskRunner(pool_.get(), runner_.get()); const AlternativeService alternative_service1( NextProto::kProtoQUIC, kDefaultServerHostName, kDefaultServerPort); @@ -12678,14 +12668,14 @@ SCOPED_TRACE(j); EXPECT_EQ(i - (kMaxRecentCryptoConfigs + 1) < j && j <= i, !QuicSessionPoolPeer::CryptoConfigCacheIsEmpty( - factory_.get(), kQuicServerId, + pool_.get(), kQuicServerId, QuicSessionPool::QuicCryptoClientConfigKey( network_anonymization_keys[j]))); } // Close the sessions, which should cause its CryptoConfigCache to be moved // to the MRU cache, potentially evicting the oldest entry.. - factory_->CloseAllSessions(ERR_FAILED, quic::QUIC_PEER_GOING_AWAY); + pool_->CloseAllSessions(ERR_FAILED, quic::QUIC_PEER_GOING_AWAY); // There should now be at most kMaxRecentCryptoConfigs live // CryptoConfigCaches @@ -12693,7 +12683,7 @@ SCOPED_TRACE(j); EXPECT_EQ(i - kMaxRecentCryptoConfigs < j && j <= i, !QuicSessionPoolPeer::CryptoConfigCacheIsEmpty( - factory_.get(), kQuicServerId, + pool_.get(), kQuicServerId, QuicSessionPool::QuicCryptoClientConfigKey( network_anonymization_keys[j]))); } @@ -12702,10 +12692,10 @@ TEST_P(QuicSessionPoolTest, YieldAfterPackets) { Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); - QuicSessionPoolPeer::SetYieldAfterPackets(factory_.get(), 0); + QuicSessionPoolPeer::SetYieldAfterPackets(pool_.get(), 0); MockQuicData socket_data(version_); socket_data.AddRead(SYNCHRONOUS, ConstructServerConnectionClosePacket(1)); @@ -12745,11 +12735,11 @@ TEST_P(QuicSessionPoolTest, YieldAfterDuration) { Initialize(); - factory_->set_has_quic_ever_worked_on_current_network(true); + pool_->set_has_quic_ever_worked_on_current_network(true); ProofVerifyDetailsChromium verify_details = DefaultProofVerifyDetails(); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); QuicSessionPoolPeer::SetYieldAfterDuration( - factory_.get(), quic::QuicTime::Delta::FromMilliseconds(-1)); + pool_.get(), quic::QuicTime::Delta::FromMilliseconds(-1)); MockQuicData socket_data(version_); socket_data.AddRead(SYNCHRONOUS, ConstructServerConnectionClosePacket(1)); @@ -13482,7 +13472,7 @@ // alive. std::unique_ptr<QuicCryptoClientConfigHandle> crypto_config_handle = QuicSessionPoolPeer::GetCryptoConfig( - factory_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); + pool_.get(), QuicSessionPool::QuicCryptoClientConfigKey()); struct TestCase { TestCase(const std::string& host, @@ -13508,14 +13498,14 @@ // Clear cached states for the origin https://www.example.com:4433. GURL origin("https://www.example.com:4433"); - factory_->ClearCachedStatesInCryptoConfig(base::BindRepeating( + pool_->ClearCachedStatesInCryptoConfig(base::BindRepeating( static_cast<bool (*)(const GURL&, const GURL&)>(::operator==), origin)); EXPECT_FALSE(test_cases[0].state->certs().empty()); EXPECT_FALSE(test_cases[1].state->certs().empty()); EXPECT_TRUE(test_cases[2].state->certs().empty()); // Clear all cached states. - factory_->ClearCachedStatesInCryptoConfig( + pool_->ClearCachedStatesInCryptoConfig( base::RepeatingCallback<bool(const GURL&)>()); EXPECT_TRUE(test_cases[0].state->certs().empty()); EXPECT_TRUE(test_cases[1].state->certs().empty()); @@ -13534,8 +13524,7 @@ Initialize(); - const quic::QuicConfig* config = - QuicSessionPoolPeer::GetConfig(factory_.get()); + const quic::QuicConfig* config = QuicSessionPoolPeer::GetConfig(pool_.get()); EXPECT_EQ(quic_params_->connection_options, config->SendConnectionOptions()); EXPECT_TRUE(config->HasClientRequestedIndependentOption( quic::kTBBR, quic::Perspective::IS_CLIENT)); @@ -13640,8 +13629,7 @@ quic_params_->max_idle_time_before_crypto_handshake = base::Seconds(13); Initialize(); - const quic::QuicConfig* config = - QuicSessionPoolPeer::GetConfig(factory_.get()); + const quic::QuicConfig* config = QuicSessionPoolPeer::GetConfig(pool_.get()); EXPECT_EQ(quic::QuicTime::Delta::FromSeconds(11), config->max_time_before_crypto_handshake()); EXPECT_EQ(quic::QuicTime::Delta::FromSeconds(13), @@ -13801,7 +13789,7 @@ host_resolver_->set_ondemand_mode(true); crypto_client_stream_factory_.set_handshake_mode( MockCryptoClientStream::ZERO_RTT); - factory_->set_has_quic_ever_worked_on_current_network(false); + pool_->set_has_quic_ever_worked_on_current_network(false); MockQuicData socket_data(version_); socket_data.AddReadPause(); @@ -13881,7 +13869,7 @@ host_resolver_->set_synchronous_mode(true); crypto_client_stream_factory_.set_handshake_mode( MockCryptoClientStream::ZERO_RTT); - factory_->set_has_quic_ever_worked_on_current_network(false); + pool_->set_has_quic_ever_worked_on_current_network(false); MockQuicData socket_data(version_); socket_data.AddReadPause(); @@ -14050,7 +14038,7 @@ // Ensure that the session is alive and active before we read the error. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Resume the socket data to get the read error delivered. @@ -14079,7 +14067,7 @@ // Ensure that the session is alive and active before we read the error. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Resume the socket data to get the read error delivered. @@ -14108,7 +14096,7 @@ // Ensure that the session is alive and active before we read the error. QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); EXPECT_TRUE(HasActiveSession(kDefaultDestination)); // Resume the socket data to get the zero-length read delivered. @@ -14813,7 +14801,7 @@ socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket()); socket_data.AddSocketDataToFactory(socket_factory_.get()); - SessionAttemptHelper session_attempt(factory_.get(), version_); + SessionAttemptHelper session_attempt(pool_.get(), version_); NetErrorDetails details; session_attempt.attempt()->PopulateNetErrorDetails(&details); @@ -14985,7 +14973,7 @@ // Ensure that we have an active session. EXPECT_TRUE(HasActiveSession(kDefaultDestination)); QuicChromiumClientSession* session = GetActiveSession(kDefaultDestination); - EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(factory_.get(), session)); + EXPECT_TRUE(QuicSessionPoolPeer::IsLiveSession(pool_.get(), session)); // Build a session with `ConnectionKeepAliveConfig`. RequestBuilder builder2(this);
diff --git a/net/quic/quic_session_pool_test_base.cc b/net/quic/quic_session_pool_test_base.cc index e28caaeb..3eb55ec 100644 --- a/net/quic/quic_session_pool_test_base.cc +++ b/net/quic/quic_session_pool_test_base.cc
@@ -129,7 +129,7 @@ request(pool) {} QuicSessionPoolTestBase::RequestBuilder::RequestBuilder( QuicSessionPoolTestBase* test) - : RequestBuilder(test, test->factory_.get()) {} + : RequestBuilder(test, test->pool_.get()) {} QuicSessionPoolTestBase::RequestBuilder::~RequestBuilder() = default; int QuicSessionPoolTestBase::RequestBuilder::CallRequest() { @@ -189,8 +189,8 @@ QuicSessionPoolTestBase::~QuicSessionPoolTestBase() = default; void QuicSessionPoolTestBase::Initialize() { - DCHECK(!factory_); - factory_ = std::make_unique<QuicSessionPool>( + DCHECK(!pool_); + pool_ = std::make_unique<QuicSessionPool>( net_log_.net_log(), host_resolver_.get(), &ssl_config_service_, socket_factory_.get(), http_server_properties_.get(), cert_verifier_.get(), &transport_security_state_, proxy_delegate_.get(), @@ -236,7 +236,7 @@ quic::QuicServerId server_id(scheme_host_port.host(), scheme_host_port.port()); return QuicSessionPoolPeer::HasActiveSession( - factory_.get(), server_id, privacy_mode, network_anonymization_key, + pool_.get(), server_id, privacy_mode, network_anonymization_key, proxy_chain, session_usage, require_dns_https_alpn); } @@ -246,8 +246,8 @@ bool require_dns_https_alpn) { quic::QuicServerId server_id(scheme_host_port.host(), scheme_host_port.port()); - return QuicSessionPoolPeer::HasActiveJob( - factory_.get(), server_id, privacy_mode, require_dns_https_alpn); + return QuicSessionPoolPeer::HasActiveJob(pool_.get(), server_id, privacy_mode, + require_dns_https_alpn); } // Get the pending, not activated session, if there is only one session alive. @@ -256,7 +256,7 @@ quic::QuicServerId server_id(scheme_host_port.host(), scheme_host_port.port()); return QuicSessionPoolPeer::GetPendingSession( - factory_.get(), server_id, PRIVACY_MODE_DISABLED, scheme_host_port); + pool_.get(), server_id, PRIVACY_MODE_DISABLED, scheme_host_port); } QuicChromiumClientSession* QuicSessionPoolTestBase::GetActiveSession( @@ -269,7 +269,7 @@ quic::QuicServerId server_id(scheme_host_port.host(), scheme_host_port.port()); return QuicSessionPoolPeer::GetActiveSession( - factory_.get(), server_id, privacy_mode, network_anonymization_key, + pool_.get(), server_id, privacy_mode, network_anonymization_key, proxy_chain, session_usage, require_dns_https_alpn); } @@ -313,7 +313,7 @@ session->connection()->OnGoAwayFrame(goaway); } - factory_->OnSessionClosed(session); + pool_->OnSessionClosed(session); EXPECT_FALSE(HasActiveSession(destination)); socket_data.ExpectAllReadDataConsumed(); socket_data.ExpectAllWriteDataConsumed();
diff --git a/net/quic/quic_session_pool_test_base.h b/net/quic/quic_session_pool_test_base.h index 81f0a5d..cf9b3d7 100644 --- a/net/quic/quic_session_pool_test_base.h +++ b/net/quic/quic_session_pool_test_base.h
@@ -288,7 +288,7 @@ std::unique_ptr<TestProxyDelegate> proxy_delegate_; std::unique_ptr<ScopedMockNetworkChangeNotifier> scoped_mock_network_change_notifier_; - std::unique_ptr<QuicSessionPool> factory_; + std::unique_ptr<QuicSessionPool> pool_; NetLogWithSource net_log_; TestCompletionCallback callback_;
diff --git a/net/test/embedded_test_server/install_default_websocket_handlers.cc b/net/test/embedded_test_server/install_default_websocket_handlers.cc index 78ad4f5..2ae271e 100644 --- a/net/test/embedded_test_server/install_default_websocket_handlers.cc +++ b/net/test/embedded_test_server/install_default_websocket_handlers.cc
@@ -11,6 +11,7 @@ #include "net/test/embedded_test_server/create_websocket_handler.h" #include "net/test/embedded_test_server/websocket_check_origin_handler.h" #include "net/test/embedded_test_server/websocket_close_handler.h" +#include "net/test/embedded_test_server/websocket_close_immediately_handler.h" #include "net/test/embedded_test_server/websocket_close_observer_handler.h" #include "net/test/embedded_test_server/websocket_echo_handler.h" #include "net/test/embedded_test_server/websocket_echo_request_headers_handler.h" @@ -42,6 +43,8 @@ RegisterWebSocketHandler<WebSocketCheckOriginHandler>(server, "/check-origin"); RegisterWebSocketHandler<WebSocketCloseHandler>(server, "/close"); + RegisterWebSocketHandler<WebSocketCloseImmediatelyHandler>( + server, "/close-immediately"); RegisterWebSocketHandler<WebSocketCloseObserverHandler>(server, "/close-observer"); RegisterWebSocketHandler<WebSocketEchoHandler>(server,
diff --git a/net/test/embedded_test_server/websocket_close_immediately_handler.cc b/net/test/embedded_test_server/websocket_close_immediately_handler.cc new file mode 100644 index 0000000..799d011 --- /dev/null +++ b/net/test/embedded_test_server/websocket_close_immediately_handler.cc
@@ -0,0 +1,19 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/test/embedded_test_server/websocket_close_immediately_handler.h" + +namespace net::test_server { + +WebSocketCloseImmediatelyHandler::WebSocketCloseImmediatelyHandler( + scoped_refptr<net::test_server::WebSocketConnection> connection) + : WebSocketHandler(std::move(connection)) {} + +WebSocketCloseImmediatelyHandler::~WebSocketCloseImmediatelyHandler() = default; + +void WebSocketCloseImmediatelyHandler::OnHandshakeComplete() { + connection()->StartClosingHandshake(/*code=*/std::nullopt, /*message=*/""); +} + +} // namespace net::test_server
diff --git a/net/test/embedded_test_server/websocket_close_immediately_handler.h b/net/test/embedded_test_server/websocket_close_immediately_handler.h new file mode 100644 index 0000000..9a3a7c3 --- /dev/null +++ b/net/test/embedded_test_server/websocket_close_immediately_handler.h
@@ -0,0 +1,28 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NET_TEST_EMBEDDED_TEST_SERVER_WEBSOCKET_CLOSE_IMMEDIATELY_HANDLER_H_ +#define NET_TEST_EMBEDDED_TEST_SERVER_WEBSOCKET_CLOSE_IMMEDIATELY_HANDLER_H_ + +#include "base/memory/scoped_refptr.h" +#include "net/test/embedded_test_server/websocket_connection.h" +#include "net/test/embedded_test_server/websocket_handler.h" + +namespace net::test_server { + +// WebSocketCloseImmediatelyHandler is a handler for WebSocket connections that +// cleanly closes the WebSocket immediately after receiving a handshake. +class WebSocketCloseImmediatelyHandler + : public net::test_server::WebSocketHandler { + public: + explicit WebSocketCloseImmediatelyHandler( + scoped_refptr<net::test_server::WebSocketConnection> connection); + ~WebSocketCloseImmediatelyHandler() override; + + void OnHandshakeComplete() override; +}; + +} // namespace net::test_server + +#endif // NET_TEST_EMBEDDED_TEST_SERVER_WEBSOCKET_CLOSE_IMMEDIATELY_HANDLER_H_
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index d0ebd759..065bff0d 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn
@@ -1011,6 +1011,31 @@ remote_webauthn_path = "/opt/google/chrome-remote-desktop/remote-webauthn" } + # LINT.IfChange(extension_ids) + if (is_debug) { + companion_extension_ids = [ + "inomeogfingihgjfjlpeplalcfajhgai", # prod + "pbnaomcgbfiofkfobmlhmdobjchjkphi", # dev + ] + security_key_extension_ids = [ + "djjmngfglakhkhmgcfdmjalogilepkhd", # prod + "kbapnajlciffffomeaphfpckfdcfopef", # dev + ] + } else { + companion_extension_ids = [ + "inomeogfingihgjfjlpeplalcfajhgai", # prod + ] + security_key_extension_ids = [ + "djjmngfglakhkhmgcfdmjalogilepkhd", # prod + ] + } + + # LINT.ThenChange(/remoting/host/it2me/it2me_native_messaging_host_allowed_origins.h:it2me_origins, /remoting/host/webauthn/remote_webauthn_extension_notifier.cc:extension_ids) + + companion_extension_ids_joined = string_join(",", companion_extension_ids) + security_key_extension_ids_joined = + string_join(",", security_key_extension_ids) + script = "../tools/build/remoting_localize.py" sources = [ @@ -1032,6 +1057,10 @@ "IT2ME_HOST_PATH=$it2me_host_path", "--define", "REMOTE_WEBAUTHN_PATH=$remote_webauthn_path", + "--define_list", + "COMPANION_EXTENSION_IDS=$companion_extension_ids_joined", + "--define_list", + "SECURITY_KEY_EXTENSION_IDS=$security_key_extension_ids_joined", "--variables", rebase_path(branding_path, root_build_dir), "--template",
diff --git a/remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2 b/remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2 index 32051b0..44963e9 100644 --- a/remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2 +++ b/remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2
@@ -7,9 +7,8 @@ # chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc # to keep the two lists in sync. #} "allowed_origins": [ - {# Chrome Extension (Prod) #} - "chrome-extension://inomeogfingihgjfjlpeplalcfajhgai/", - {# Chrome Extension (Dev Build) #} - "chrome-extension://hpodccmdligbeohchckkeajbfohibipg/" + {%- for id in COMPANION_EXTENSION_IDS %} + "chrome-extension://{{ id }}/"{% if not loop.last %},{% endif %} + {%- endfor %} ] }
diff --git a/remoting/host/it2me/it2me_native_messaging_host_allowed_origins.h b/remoting/host/it2me/it2me_native_messaging_host_allowed_origins.h index d9c09c1..427b54d 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_allowed_origins.h +++ b/remoting/host/it2me/it2me_native_messaging_host_allowed_origins.h
@@ -9,12 +9,11 @@ namespace remoting { // The set of origins which are allowed to instantiate an It2Me host. -// If you modify the list of allowed_origins, don't forget to update -// remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2 -// to keep the two lists in sync. +// LINT.IfChange(it2me_origins) inline constexpr const char* kIt2MeOrigins[] = { "chrome-extension://inomeogfingihgjfjlpeplalcfajhgai/", - "chrome-extension://hpodccmdligbeohchckkeajbfohibipg/"}; + "chrome-extension://pbnaomcgbfiofkfobmlhmdobjchjkphi/"}; +// LINT.ThenChange(/remoting/host/BUILD.gn:extension_ids) // The name used to register the It2Me native message host. inline constexpr char kIt2MeNativeMessageHostName[] =
diff --git a/remoting/host/setup/com.google.chrome.remote_desktop.json.jinja2 b/remoting/host/setup/com.google.chrome.remote_desktop.json.jinja2 index d02ac10..34353f6 100644 --- a/remoting/host/setup/com.google.chrome.remote_desktop.json.jinja2 +++ b/remoting/host/setup/com.google.chrome.remote_desktop.json.jinja2
@@ -4,9 +4,8 @@ "type": "stdio", "path": "{{ ME2ME_HOST_PATH }}", "allowed_origins": [ - {# Chrome Extension (Prod) #} - "chrome-extension://inomeogfingihgjfjlpeplalcfajhgai/", - {# Chrome Extension (Dev Build) #} - "chrome-extension://hpodccmdligbeohchckkeajbfohibipg/" + {%- for id in COMPANION_EXTENSION_IDS %} + "chrome-extension://{{ id }}/"{% if not loop.last %},{% endif %} + {%- endfor %} ] }
diff --git a/remoting/host/setup/com.google.chrome.remote_webauthn.json.jinja2 b/remoting/host/setup/com.google.chrome.remote_webauthn.json.jinja2 index 0413d17..70635fd9e 100644 --- a/remoting/host/setup/com.google.chrome.remote_webauthn.json.jinja2 +++ b/remoting/host/setup/com.google.chrome.remote_webauthn.json.jinja2
@@ -4,9 +4,8 @@ "type": "stdio", "path": "{{ REMOTE_WEBAUTHN_PATH }}", "allowed_origins": [ - {# Chrome Security Key Extension (Prod) #} - "chrome-extension://djjmngfglakhkhmgcfdmjalogilepkhd/", - {# Chrome Security Key Extension (Dev Build) #} - "chrome-extension://hfmpidnhglhndeamkbopljnclamhmnaj/" + {%- for id in COMPANION_EXTENSION_IDS + SECURITY_KEY_EXTENSION_IDS %} + "chrome-extension://{{ id }}/"{% if not loop.last %},{% endif %} + {%- endfor %} ] }
diff --git a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc index 82305ea..ad0c713 100644 --- a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc +++ b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc
@@ -209,16 +209,24 @@ const std::vector<base::FilePath::StringType>& RemoteWebAuthnExtensionNotifier::GetRemoteWebAuthnExtensionIds() { static const base::NoDestructor<std::vector<base::FilePath::StringType>> ids({ - // Prod extension ID - FILE_PATH_LITERAL("djjmngfglakhkhmgcfdmjalogilepkhd"), + // LINT.IfChange(extension_ids) + // Prod security key extension ID + FILE_PATH_LITERAL("djjmngfglakhkhmgcfdmjalogilepkhd"), - // For debug builds we wake up both extensions, so that developers don't - // have to build and install the dev extension for using WebAuthn - // forwarding. + // Prod companion extension ID + FILE_PATH_LITERAL("inomeogfingihgjfjlpeplalcfajhgai"), + + // For debug builds we wake up both extensions, so that developers don't + // have to build and install the dev extension for using WebAuthn + // forwarding. #if !defined(NDEBUG) - // Dev extension ID - FILE_PATH_LITERAL("hfmpidnhglhndeamkbopljnclamhmnaj"), + // Dev security key extension ID + FILE_PATH_LITERAL("kbapnajlciffffomeaphfpckfdcfopef"), + + // Dev companion extension ID + FILE_PATH_LITERAL("pbnaomcgbfiofkfobmlhmdobjchjkphi"), #endif + // LINT.ThenChange(/remoting/host/BUILD.gn:extension_ids) }); return *ids; }
diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py index de10d228..59e6b8a68 100755 --- a/remoting/tools/build/remoting_localize.py +++ b/remoting/tools/build/remoting_localize.py
@@ -672,6 +672,11 @@ for define in options.define: context.update(dict([define.split('=', 1)])); + if options.define_list: + for define_list in options.define_list: + kv = define_list.split('=', 1) + context.update(dict([[kv[0], kv[1].split(',')]])) + # Read NAME=VALUE variables from file. if options.variables: for file_name in options.variables: @@ -753,6 +758,10 @@ '-d', '--define', dest='define', action='append', type='string', help='define a variable (NAME=VALUE).') parser.add_option( + '--define_list', dest='define_list', action='append', type='string', + help='define a list variable, with list items separated by commas ' + '(NAME=VALUE1,VALUE2,...).') + parser.add_option( '--encoding', dest='encoding', type='string', default='utf-8', help="set the encoding of <output>. 'utf-8' is the default.") parser.add_option(
diff --git a/services/webnn/ort/context_impl_ort.cc b/services/webnn/ort/context_impl_ort.cc index 77654f1..3811559 100644 --- a/services/webnn/ort/context_impl_ort.cc +++ b/services/webnn/ort/context_impl_ort.cc
@@ -209,7 +209,7 @@ /*split_input=*/ {DataTypeConstraint::kAllDataTypesAtLeast8bits, kMaxNonScalarRank}, /*tanh_input=*/{DataTypeConstraint::kFloat16To32, kMaxRank}, - /*tile_input=*/{}, + /*tile_input=*/{DataTypeConstraint::kAllDataTypesAtLeast8bits, kMaxRank}, /*transpose_input=*/{SupportedDataTypes::All(), kMaxRank}, /*triangular_input=*/{}, /*where_condition=*/{},
diff --git a/services/webnn/ort/graph_builder_ort.cc b/services/webnn/ort/graph_builder_ort.cc index f723b101..1a9225b 100644 --- a/services/webnn/ort/graph_builder_ort.cc +++ b/services/webnn/ort/graph_builder_ort.cc
@@ -83,6 +83,7 @@ constexpr base::cstring_view kOpTypeSoftsign = "Softsign"; constexpr base::cstring_view kOpTypeSplit = "Split"; constexpr base::cstring_view kOpTypeTanh = "Tanh"; +constexpr base::cstring_view kOpTypeTile = "Tile"; constexpr base::cstring_view kOpTypeTranspose = "Transpose"; // Pooling operations @@ -256,12 +257,12 @@ /*shape=*/{}, base::span_from_ref(value)); } -std::string GraphBuilderOrt::CreateInitializerForShape( - base::span<const uint32_t> shape) { - std::array<int64_t, 1> new_shape_dims = { - base::checked_cast<int64_t>(shape.size())}; - std::vector<int64_t> new_shape_value(shape.begin(), shape.end()); - return CreateInitializer<int64_t>(new_shape_dims, new_shape_value); +std::string GraphBuilderOrt::CreateInt64InitializerForUint32Array( + base::span<const uint32_t> array) { + std::array<int64_t, 1> array_dims = { + base::checked_cast<int64_t>(array.size())}; + base::FixedArray<int64_t> array_value(array.begin(), array.end()); + return CreateInitializer<int64_t>(array_dims, array_value); } void GraphBuilderOrt::AddCastNode(base::cstring_view node_name, @@ -300,7 +301,7 @@ base::span<const uint32_t> shape) { // `new_shape` should be the name of an int64 tensor that specifies the // output's shape. - const std::string new_shape = CreateInitializerForShape(shape); + const std::string new_shape = CreateInt64InitializerForUint32Array(shape); std::array<const char*, 2> inputs = {input.c_str(), new_shape.c_str()}; std::array<const char*, 1> outputs = {output.c_str()}; @@ -486,10 +487,11 @@ CHECK(data_type_limits.conv2d_input.Supports( GetOperand(conv2d.filter_operand_id).descriptor)); std::vector<const char*> inputs = {input.c_str(), filter.c_str()}; + std::string bias; if (conv2d.bias_operand_id.has_value()) { CHECK(data_type_limits.conv2d_bias.Supports( GetOperand(conv2d.bias_operand_id.value()).descriptor)); - const std::string bias = GetOperandNameById(conv2d.bias_operand_id.value()); + bias = GetOperandNameById(conv2d.bias_operand_id.value()); inputs.push_back(bias.c_str()); } std::array<const char*, 1> outputs = {output.c_str()}; @@ -1179,7 +1181,8 @@ GetOperand(reshape.output_operand_id).descriptor.shape(); // `new_shape` should be the name of an int64 tensor that specifies the // output's shape. - const std::string new_shape = CreateInitializerForShape(output_shape); + const std::string new_shape = + CreateInt64InitializerForUint32Array(output_shape); std::array<const char*, 2> inputs = {input.c_str(), new_shape.c_str()}; std::array<const char*, 1> outputs = {output.c_str()}; @@ -1325,15 +1328,15 @@ // 'split' is a 1-D tensor which specifies the length of each output. The sum // of the values must be equal to the input size along 'axis'. // https://onnx.ai/onnx/operators/onnx__Split.html#inputs - base::FixedArray<int64_t> split_sizes(output_count); + base::FixedArray<uint32_t> split_sizes(output_count); for (size_t i = 0; i < output_count; i++) { const std::vector<uint32_t>& output_shape = GetOperand(split.output_operand_ids[i]).descriptor.shape(); CHECK_LT(split.axis, output_shape.size()); - split_sizes[i] = base::checked_cast<int64_t>(output_shape[split.axis]); + split_sizes[i] = output_shape[split.axis]; } - const std::string split_input = CreateInitializer<int64_t>( - {base::checked_cast<uint32_t>(split_sizes.size())}, split_sizes); + const std::string split_input = + CreateInt64InitializerForUint32Array(split_sizes); std::array<const char*, 2> inputs = {input.c_str(), split_input.c_str()}; base::FixedArray<std::string> output_names(output_count); @@ -1350,6 +1353,23 @@ model_editor_.AddNode(kOpTypeSplit, node_name, inputs, outputs, attributes); } +void GraphBuilderOrt::AddTileOperation(const mojom::Tile& tile) { + const std::string node_name = GenerateNodeName(tile.label); + const std::string input = GetOperandNameById(tile.input_operand_id); + const std::string output = GetOperandNameById(tile.output_operand_id); + + CHECK(context_properties_.data_type_limits.tile_input.Supports( + GetOperand(tile.input_operand_id).descriptor)); + + const std::string repeats = + CreateInt64InitializerForUint32Array(tile.repetitions); + + std::array<const char*, 2> inputs = {input.data(), repeats.data()}; + std::array<const char*, 1> outputs = {output.c_str()}; + + model_editor_.AddNode(kOpTypeTile, node_name, inputs, outputs); +} + void GraphBuilderOrt::AddTransposeOperation(const mojom::Transpose& transpose) { const std::string node_name = GenerateNodeName(transpose.label); const std::string input = GetOperandNameById(transpose.input_operand_id); @@ -1514,6 +1534,10 @@ AddUnaryOperation(*operation->get_tanh(), kOpTypeTanh); break; } + case mojom::Operation::Tag::kTile: { + AddTileOperation(*operation->get_tile()); + break; + } case mojom::Operation::Tag::kTranspose: { AddTransposeOperation(*operation->get_transpose()); break; @@ -1538,7 +1562,6 @@ case mojom::Operation::Tag::kReverse: case mojom::Operation::Tag::kSlice: case mojom::Operation::Tag::kSoftplus: - case mojom::Operation::Tag::kTile: case mojom::Operation::Tag::kTriangular: case mojom::Operation::Tag::kWhere: NOTREACHED() << "[WebNN] Unsupported operation.";
diff --git a/services/webnn/ort/graph_builder_ort.h b/services/webnn/ort/graph_builder_ort.h index ccac704c..5190632 100644 --- a/services/webnn/ort/graph_builder_ort.h +++ b/services/webnn/ort/graph_builder_ort.h
@@ -107,10 +107,11 @@ requires internal::IsSupportedTensorType<DataType> std::string CreateScalarInitializer(const DataType& value); - // A helper method creating an int64 tensor with the given shape value. - // It can be used by `reshape` and `expand` to create an initializer that - // specifies the output's shape. - std::string CreateInitializerForShape(base::span<const uint32_t> shape); + // A helper method wrapping the `CreateInitializer` above. It creates a 1D + // int64 initializer with the given uint32 array (shape is [array.size()]) to + // the graph, returning the name of the initializer. + std::string CreateInt64InitializerForUint32Array( + base::span<const uint32_t> array); void AddCastNode(base::cstring_view node_name, base::cstring_view input, @@ -174,6 +175,7 @@ void AddScatterNDOperation(const mojom::ScatterND& scatter_nd); void AddSoftmaxOperation(const mojom::Softmax& softmax); void AddSplitOperation(const mojom::Split& split); + void AddTileOperation(const mojom::Tile& tile); void AddTransposeOperation(const mojom::Transpose& transpose); [[nodiscard]] base::expected<std::unique_ptr<ModelEditor::ModelInfo>,
diff --git a/storage/browser/file_system/file_system_context.cc b/storage/browser/file_system/file_system_context.cc index 9e6ca65..3a4c575a 100644 --- a/storage/browser/file_system/file_system_context.cc +++ b/storage/browser/file_system/file_system_context.cc
@@ -12,6 +12,7 @@ #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/debug/crash_logging.h" #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" @@ -328,6 +329,7 @@ if (found != backend_map_.end()) { return found->second; } + SCOPED_CRASH_KEY_NUMBER("398002857", "file_system_type", type); NOTREACHED() << "Unknown filesystem type: " << type; }
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json index 4a7c7b0..ac4a4c2 100644 --- a/testing/buildbot/chrome.json +++ b/testing/buildbot/chrome.json
@@ -19,48 +19,69 @@ "chromeos-betty-cfi-thin-lto-chrome-tests": { "skylab_tests": [ { - "autotest_name": "tast.chrome-from-gcs", "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome" + ], + "cros_test_tags_exclude": [ + "informational", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "name": "chrome_all_tast_tests RELEASE_LKGM", "shard_level_retries_on_ctp": 1, - "shards": 15, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_all_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome", + "informational", + "group:criticalstaging" + ], + "cros_test_tags_exclude": [ + "dep:lacros", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_criticalstaging_tast_tests RELEASE_LKGM", - "shards": 3, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_criticalstaging_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_criticalstaging_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 20, + "cros_test_names_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_disabled_tast_tests RELEASE_LKGM", - "shards": 2, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_disabled_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_disabled_tast_tests/", - "test_level_retries": 1, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" @@ -140,48 +161,69 @@ "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome" + ], + "cros_test_tags_exclude": [ + "informational", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "name": "chrome_all_tast_tests RELEASE_LKGM", "shard_level_retries_on_ctp": 1, - "shards": 20, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_all_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome", + "informational", + "group:criticalstaging" + ], + "cros_test_tags_exclude": [ + "dep:lacros", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_criticalstaging_tast_tests RELEASE_LKGM", - "shards": 3, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_criticalstaging_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_criticalstaging_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 20, + "cros_test_names_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_disabled_tast_tests RELEASE_LKGM", - "shards": 2, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_disabled_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_disabled_tast_tests/", - "test_level_retries": 1, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" @@ -566,48 +608,69 @@ "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome" + ], + "cros_test_tags_exclude": [ + "informational", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "name": "chrome_all_tast_tests RELEASE_LKGM", "shard_level_retries_on_ctp": 1, - "shards": 20, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_all_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome", + "informational", + "group:criticalstaging" + ], + "cros_test_tags_exclude": [ + "dep:lacros", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_criticalstaging_tast_tests RELEASE_LKGM", - "shards": 3, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_criticalstaging_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_criticalstaging_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "betty", + "cros_test_max_in_shard": 20, + "cros_test_names_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_disabled_tast_tests RELEASE_LKGM", - "shards": 2, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_disabled_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_disabled_tast_tests/", - "test_level_retries": 1, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" @@ -1880,48 +1943,69 @@ "chromeos-reven-chrome-tests": { "skylab_tests": [ { - "autotest_name": "tast.chrome-from-gcs", "cros_board": "reven-vmtest", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome" + ], + "cros_test_tags_exclude": [ + "informational", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "name": "chrome_all_tast_tests RELEASE_LKGM", "shard_level_retries_on_ctp": 1, - "shards": 15, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_all_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "reven-vmtest", + "cros_test_max_in_shard": 50, + "cros_test_names_exclude_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], + "cros_test_tags": [ + "group:mainline", + "dep:chrome", + "informational", + "group:criticalstaging" + ], + "cros_test_tags_exclude": [ + "dep:lacros", + "dep:no_chrome_dcheck" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_criticalstaging_tast_tests RELEASE_LKGM", - "shards": 3, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_criticalstaging_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_criticalstaging_tast_tests/", - "test_level_retries": 2, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM" }, { - "autotest_name": "tast.chrome-from-gcs", "ci_only": true, "cros_board": "reven-vmtest", + "cros_test_max_in_shard": 20, + "cros_test_names_from_file": [ + "chromeos/tast_control_disabled_tests.txt" + ], "dut_pool": "vmlab", "experiment_percentage": 100, "name": "chrome_disabled_tast_tests RELEASE_LKGM", - "shards": 2, "tast_expr": "STUB_STRING_TO_RUN_TAST_TESTS", "test": "chrome_disabled_tast_tests", "test_id_prefix": "ninja://chromeos:chrome_disabled_tast_tests/", - "test_level_retries": 1, "timeout_sec": 14400, "use_lkgm": true, "variant_id": "RELEASE_LKGM"
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json index d87ae5e..14e45f4 100644 --- a/testing/buildbot/chromium.perf.json +++ b/testing/buildbot/chromium.perf.json
@@ -2071,7 +2071,7 @@ "can_use_on_swarming_builders": true, "dimensions": { "cpu": "x86-64", - "os": "Windows-10", + "os": "Windows 10 version 22H2 (Windows-10-19045)", "pool": "chrome.tests" }, "expiration": 7200,
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 1bf64bd..feeea30 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -11822,6 +11822,24 @@ ] } ], + "HlsDirectPlayback": [ + { + "platforms": [ + "chromeos", + "linux", + "mac", + "windows" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "BuiltInHlsPlayer" + ] + } + ] + } + ], "Hotspot": [ { "platforms": [ @@ -22762,6 +22780,28 @@ ] } ], + "ServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl": [ + { + "platforms": [ + "android", + "android_webview", + "chromeos", + "chromeos_lacros", + "fuchsia", + "linux", + "mac", + "windows" + ], + "experiments": [ + { + "name": "ServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl", + "enable_features": [ + "ServiceWorkerBackgroundUpdateForFindRegistrationForClientUrl" + ] + } + ] + } + ], "ServiceWorkerBackgroundUpdateForRegisteredStorageKeys": [ { "platforms": [
diff --git a/third_party/androidx/build.gradle b/third_party/androidx/build.gradle index 7e4733e..b1bf9d5 100644 --- a/third_party/androidx/build.gradle +++ b/third_party/androidx/build.gradle
@@ -306,7 +306,7 @@ google() maven { // This URL is generated by the fetch_all_androidx.py script. - url 'https://androidx.dev/snapshots/builds/13713213/artifacts/repository' + url 'https://androidx.dev/snapshots/builds/13716528/artifacts/repository' } mavenCentral() }
diff --git a/third_party/blink/public/platform/TaskTypes.md b/third_party/blink/public/platform/TaskTypes.md index d55e202f..65479ea 100644 --- a/third_party/blink/public/platform/TaskTypes.md +++ b/third_party/blink/public/platform/TaskTypes.md
@@ -26,7 +26,6 @@ | RemoteEvent | No | No | Yes | Yes | Yes | Yes | | WebSocket | No | No | Yes | Yes | Yes | Yes | | PostedMessage | No | No | No | Yes | Yes | Yes | -| BackForwardCachePostedMessage | No | No | No | Yes [^3] | Yes | Yes | | UnshippedPortMessage | No | No | Yes | Yes | Yes | Yes | | FileReading | No | No | Yes | Yes | Yes | Yes | | DatabaseAccess | No | No | No | Yes | Yes | Yes | @@ -47,7 +46,7 @@ | WakeLock | No | No | Yes | Yes | Yes | Yes | | Storage | No | No | Yes | Yes | Yes | Yes | | MachineLearning | No | No | Yes | Yes | Yes | Yes | -| WebSchedulingPostedTask | Yes [^4] | Yes [^4] | Yes | Yes | Yes | Yes | +| WebSchedulingPostedTask | Yes [^3] | Yes [^3] | Yes | Yes | Yes | Yes | | InternalDefault | No | No | Yes | Yes | Yes | Yes | | InternalLoading | No | No | Yes | Yes | Yes | No | | InternalTest | No | No | No | No | No | Yes | @@ -76,6 +75,4 @@ [^2] "No" if the "IntensiveWakeUpThrottling" feature is disabled. -[^3] "No" if the page is in BFCache. - -[^4] "Yes" only for `scheduler.postTask()` tasks where delay > 0. +[^3] "Yes" only for `scheduler.postTask()` tasks where delay > 0.
diff --git a/third_party/blink/public/platform/task_type.h b/third_party/blink/public/platform/task_type.h index d194f56..b2c6c6e 100644 --- a/third_party/blink/public/platform/task_type.h +++ b/third_party/blink/public/platform/task_type.h
@@ -291,10 +291,6 @@ // submission. Remove this if the autofill tasks become synchronous. kInternalAutofill = 88, - // Like kPostedMessage, but for tasks that must run on a page in the - // Back-Forward Cache. - kBackForwardCachePostedMessage = 89, - /////////////////////////////////////// // The following task types are only for thread-local queues. /////////////////////////////////////// @@ -324,7 +320,7 @@ kWorkerThreadTaskQueueV8 = 47, kWorkerThreadTaskQueueCompositor = 48, - kMaxValue = kBackForwardCachePostedMessage, + kMaxValue = kInternalAutofill, }; } // namespace blink
diff --git a/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc b/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc index 1fc30a0..a91b771 100644 --- a/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc +++ b/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc
@@ -1525,7 +1525,8 @@ } return nullptr; } - MathFunctionParser math_parser(stream, context, value_range); + MathFunctionParser math_parser(stream, context, value_range, + CSSMathExpressionNode::Flags()); if (const CSSMathFunctionValue* calculation = math_parser.Value()) { if (calculation->Category() == kCalcTime) { return math_parser.ConsumeValue(); @@ -1552,7 +1553,8 @@ } MathFunctionParser math_parser(stream, context, - CSSPrimitiveValue::ValueRange::kNonNegative); + CSSPrimitiveValue::ValueRange::kNonNegative, + CSSMathExpressionNode::Flags()); const CSSMathFunctionValue* math_value = math_parser.Value(); if (math_value && math_value->IsResolution()) { return math_parser.ConsumeValue();
diff --git a/third_party/blink/renderer/core/dom/attribute.h b/third_party/blink/renderer/core/dom/attribute.h index 870e9be..34f16d6 100644 --- a/third_party/blink/renderer/core/dom/attribute.h +++ b/third_party/blink/renderer/core/dom/attribute.h
@@ -39,7 +39,7 @@ template <> inline constexpr bool kCanSafelyConvertToByteSpan<::blink::Attribute> = kCanSafelyConvertToByteSpan<::blink::QualifiedName> && - kCanSafelyConvertToByteSpan<::WTF::AtomicString>; + kCanSafelyConvertToByteSpan<::blink::AtomicString>; } namespace blink {
diff --git a/third_party/blink/renderer/core/dom/attribute_collection.h b/third_party/blink/renderer/core/dom/attribute_collection.h index 4fdbd03..5a3ec0e 100644 --- a/third_party/blink/renderer/core/dom/attribute_collection.h +++ b/third_party/blink/renderer/core/dom/attribute_collection.h
@@ -103,9 +103,9 @@ // // A concrete example of a valid usage pattern is: // - // WTF::AtomicStringTable::WeakResult hint = - // WTF::AtomicStringTable::WeakFindLowercased(name); - // .... Mutate |WTF::AtomicStringTable| but not |collection| .... + // AtomicStringTable::WeakResult hint = + // AtomicStringTable::WeakFindLowercased(name); + // .... Mutate |AtomicStringTable| but not |collection| .... // collection.FindHinted(name, hint); // // Because FindHinted() is an existence check, as long as collection is not @@ -123,9 +123,9 @@ // making the |hint| semantically invalid. However, because the // |collection| is not mutated, |hint| will not match anything. iterator FindHinted(const StringView& name, - WTF::AtomicStringTable::WeakResult hint) const; + AtomicStringTable::WeakResult hint) const; wtf_size_t FindIndexHinted(const StringView& name, - WTF::AtomicStringTable::WeakResult hint) const; + AtomicStringTable::WeakResult hint) const; protected: iterator FindWithPrefix(const StringView& name) const; @@ -189,14 +189,14 @@ ContainerMemberType>::iterator AttributeCollectionGeneric<Container, ContainerMemberType>::Find( const AtomicString& name) const { - return FindHinted(name, WTF::AtomicStringTable::WeakResult(name.Impl())); + return FindHinted(name, AtomicStringTable::WeakResult(name.Impl())); } template <typename Container, typename ContainerMemberType> inline wtf_size_t AttributeCollectionGeneric<Container, ContainerMemberType>::FindIndexHinted( const StringView& name, - WTF::AtomicStringTable::WeakResult hint) const { + AtomicStringTable::WeakResult hint) const { iterator it = FindHinted(name, hint); return it ? wtf_size_t(it - begin()) : kNotFound; } @@ -218,7 +218,7 @@ inline wtf_size_t AttributeCollectionGeneric<Container, ContainerMemberType>::FindIndex( const AtomicString& name) const { - return FindIndexHinted(name, WTF::AtomicStringTable::WeakResult(name.Impl())); + return FindIndexHinted(name, AtomicStringTable::WeakResult(name.Impl())); } template <typename Container, typename ContainerMemberType> @@ -226,7 +226,7 @@ ContainerMemberType>::iterator AttributeCollectionGeneric<Container, ContainerMemberType>::FindHinted( const StringView& name, - WTF::AtomicStringTable::WeakResult hint) const { + AtomicStringTable::WeakResult hint) const { // A slow check is required if there are any attributes with prefixes // and no unprefixed name matches. bool has_attributes_with_prefixes = false;
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc index 100a1558..b042338 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc
@@ -1825,8 +1825,7 @@ if (!HasElementData()) { return false; } - WTF::AtomicStringTable::WeakResult hint = - WeakLowercaseIfNecessary(local_name); + AtomicStringTable::WeakResult hint = WeakLowercaseIfNecessary(local_name); SynchronizeAttributeHinted(local_name, hint); if (hint.IsNull()) { return false; @@ -3239,7 +3238,7 @@ // an HTML document, then set qualifiedName to qualifiedName in ASCII // lowercase. AtomicString lowercase_name = LowercaseIfNecessary(qualified_name); - WTF::AtomicStringTable::WeakResult hint(lowercase_name.Impl()); + AtomicStringTable::WeakResult hint(lowercase_name.Impl()); // 3. Let attribute be the first attribute in the context object’s attribute // list whose qualified name is qualifiedName, and null otherwise. SynchronizeAttributeHinted(lowercase_name, hint); @@ -3282,7 +3281,7 @@ // an HTML document, then set qualifiedName to qualifiedName in ASCII // lowercase. AtomicString lowercase_name = LowercaseIfNecessary(qualified_name); - WTF::AtomicStringTable::WeakResult hint(lowercase_name.Impl()); + AtomicStringTable::WeakResult hint(lowercase_name.Impl()); // 3. Let attribute be the first attribute in the context object’s attribute // list whose qualified name is qualifiedName, and null otherwise. SynchronizeAttributeHinted(lowercase_name, hint); @@ -7004,8 +7003,7 @@ if (!HasElementData()) { return nullptr; } - WTF::AtomicStringTable::WeakResult hint = - WeakLowercaseIfNecessary(local_name); + AtomicStringTable::WeakResult hint = WeakLowercaseIfNecessary(local_name); SynchronizeAttributeHinted(local_name, hint); const Attribute* attribute = GetElementData()->Attributes().FindHinted(local_name, hint); @@ -7033,8 +7031,7 @@ if (!HasElementData()) { return false; } - WTF::AtomicStringTable::WeakResult hint = - WeakLowercaseIfNecessary(local_name); + AtomicStringTable::WeakResult hint = WeakLowercaseIfNecessary(local_name); SynchronizeAttributeHinted(local_name, hint); return GetElementData()->Attributes().FindHinted(local_name, hint); } @@ -11660,15 +11657,15 @@ return true; } -WTF::AtomicStringTable::WeakResult Element::WeakLowercaseIfNecessary( +AtomicStringTable::WeakResult Element::WeakLowercaseIfNecessary( const AtomicString& name) const { if (name.IsLowerASCII()) [[likely]] { - return WTF::AtomicStringTable::WeakResult(name); + return AtomicStringTable::WeakResult(name); } if (IsHTMLElement() && IsA<HTMLDocument>(GetDocument())) [[likely]] { - return WTF::AtomicStringTable::Instance().WeakFindLowercase(name); + return AtomicStringTable::Instance().WeakFindLowercase(name); } - return WTF::AtomicStringTable::WeakResult(name); + return AtomicStringTable::WeakResult(name); } // Note, SynchronizeAttributeHinted is safe to call between a WeakFind() and @@ -11684,7 +11681,7 @@ // without worry for UaF or false positives. void Element::SynchronizeAttributeHinted( const AtomicString& local_name, - WTF::AtomicStringTable::WeakResult hint) const { + AtomicStringTable::WeakResult hint) const { // This version of SynchronizeAttribute() is streamlined for the case where // you don't have a full QualifiedName, e.g when called from DOM API. if (!HasElementData()) { @@ -11713,7 +11710,7 @@ const AtomicString& Element::GetAttributeHinted( const AtomicString& name, - WTF::AtomicStringTable::WeakResult hint) const { + AtomicStringTable::WeakResult hint) const { if (!HasElementData()) { return g_null_atom; } @@ -11727,7 +11724,7 @@ std::pair<wtf_size_t, const QualifiedName> Element::LookupAttributeQNameHinted( AtomicString name, - WTF::AtomicStringTable::WeakResult hint) const { + AtomicStringTable::WeakResult hint) const { if (!HasElementData()) { return std::make_pair(kNotFound, QualifiedName(LowercaseIfNecessary(std::move(name)))); @@ -11841,7 +11838,7 @@ } void Element::SetAttributeHinted(AtomicString local_name, - WTF::AtomicStringTable::WeakResult hint, + AtomicStringTable::WeakResult hint, String value, ExceptionState& exception_state) { bool is_valid = RuntimeEnabledFeatures::RelaxDOMValidNamesEnabled() @@ -11874,7 +11871,7 @@ } void Element::SetAttributeHinted(AtomicString local_name, - WTF::AtomicStringTable::WeakResult hint, + AtomicStringTable::WeakResult hint, const V8TrustedType* trusted_string, ExceptionState& exception_state) { if (!Document::IsValidName(local_name)) { @@ -12027,7 +12024,7 @@ } void Element::RemoveAttributeHinted(const AtomicString& name, - WTF::AtomicStringTable::WeakResult hint) { + AtomicStringTable::WeakResult hint) { if (!HasElementData()) { return; }
diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h index b4052db..cb3b2fe8 100644 --- a/third_party/blink/renderer/core/dom/element.h +++ b/third_party/blink/renderer/core/dom/element.h
@@ -413,7 +413,7 @@ void setAttribute(AtomicString name, String value, ExceptionState& exception_state = ASSERT_NO_EXCEPTION) { - WTF::AtomicStringTable::WeakResult weak_lowercase_name = + AtomicStringTable::WeakResult weak_lowercase_name = WeakLowercaseIfNecessary(name); SetAttributeHinted(std::move(name), weak_lowercase_name, std::move(value), exception_state); @@ -423,7 +423,7 @@ void setAttribute(AtomicString name, const V8TrustedType* trusted_string, ExceptionState& exception_state) { - WTF::AtomicStringTable::WeakResult weak_lowercase_name = + AtomicStringTable::WeakResult weak_lowercase_name = WeakLowercaseIfNecessary(name); SetAttributeHinted(std::move(name), weak_lowercase_name, trusted_string, exception_state); @@ -459,7 +459,7 @@ // document, then set qualifiedName to qualifiedName in ASCII lowercase. // https://dom.spec.whatwg.org/#concept-element-attributes-get-by-name AtomicString LowercaseIfNecessary(AtomicString) const; - WTF::AtomicStringTable::WeakResult WeakLowercaseIfNecessary( + AtomicStringTable::WeakResult WeakLowercaseIfNecessary( const AtomicString&) const; // NoncedElement implementation: this is only used by HTMLElement and @@ -2169,23 +2169,22 @@ // the `hint` can be constructed from calling AtomicString::Impl(). const AtomicString& GetAttributeHinted( const AtomicString& name, - WTF::AtomicStringTable::WeakResult hint) const; + AtomicStringTable::WeakResult hint) const; void RemoveAttributeHinted(const AtomicString& name, - WTF::AtomicStringTable::WeakResult hint); - void SynchronizeAttributeHinted( - const AtomicString& name, - WTF::AtomicStringTable::WeakResult hint) const; + AtomicStringTable::WeakResult hint); + void SynchronizeAttributeHinted(const AtomicString& name, + AtomicStringTable::WeakResult hint) const; void SetAttributeHinted(AtomicString name, - WTF::AtomicStringTable::WeakResult hint, + AtomicStringTable::WeakResult hint, String value, ExceptionState& = ASSERT_NO_EXCEPTION); void SetAttributeHinted(AtomicString name, - WTF::AtomicStringTable::WeakResult hint, + AtomicStringTable::WeakResult hint, const V8TrustedType* trusted_string, ExceptionState& exception_state); std::pair<wtf_size_t, const QualifiedName> LookupAttributeQNameHinted( AtomicString name, - WTF::AtomicStringTable::WeakResult hint) const; + AtomicStringTable::WeakResult hint) const; wtf_size_t ValidateAttributeIndex(wtf_size_t index, const QualifiedName& qname) const;
diff --git a/third_party/blink/renderer/core/dom/named_node_map.cc b/third_party/blink/renderer/core/dom/named_node_map.cc index 467a7f5e..ce8cffc 100644 --- a/third_party/blink/renderer/core/dom/named_node_map.cc +++ b/third_party/blink/renderer/core/dom/named_node_map.cc
@@ -45,8 +45,7 @@ Attr* NamedNodeMap::removeNamedItem(const AtomicString& name, ExceptionState& exception_state) { - WTF::AtomicStringTable::WeakResult hint = - element_->WeakLowercaseIfNecessary(name); + AtomicStringTable::WeakResult hint = element_->WeakLowercaseIfNecessary(name); wtf_size_t index = element_->Attributes().FindIndexHinted(name, hint); if (index == kNotFound) { exception_state.ThrowDOMException(
diff --git a/third_party/blink/renderer/core/fetch/fetch_manager.cc b/third_party/blink/renderer/core/fetch/fetch_manager.cc index 6484710..163da6e 100644 --- a/third_party/blink/renderer/core/fetch/fetch_manager.cc +++ b/third_party/blink/renderer/core/fetch/fetch_manager.cc
@@ -1678,7 +1678,7 @@ // 8. If request’s URL’s scheme is not an HTTPS scheme, then throw a // TypeError. - if (!request->Url().ProtocolIs(WTF::g_https_atom)) { + if (!request->Url().ProtocolIs(g_https_atom)) { exception_state.ThrowTypeError("fetchLater is only supported over HTTPS."); return nullptr; }
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc index 33cfae2..03277987 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2334,14 +2334,14 @@ "Partitioned popins cannot open their own popin."); return nullptr; } - if (entered_window->Url().Protocol() != WTF::g_https_atom) { + if (entered_window->Url().Protocol() != g_https_atom) { exception_state.ThrowSecurityError( "Partitioned popins must be opened from https URLs.", "Partitioned popins must be opened from https URLs."); return nullptr; } // We prevent redirections via PartitionedPopinsNavigationThrottle. - if (completed_url.Protocol() != WTF::g_https_atom) { + if (completed_url.Protocol() != g_https_atom) { exception_state.ThrowSecurityError( "Partitioned popins can only open https URLs.", "Partitioned popins can only open https URLs.");
diff --git a/third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.cc b/third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.cc index 3d96977..992ca87 100644 --- a/third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.cc +++ b/third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.cc
@@ -105,11 +105,8 @@ // Freeze the frame and hook eviction. frame->GetPage()->GetPageScheduler()->SetPageVisible(false); - // Set the BFCache state before freezing the page. The scheduler policy - // update, triggered by SetPageFrozen(), depends on this state to correctly - // handle queues that can run in BFCache. - frame->GetPage()->GetPageScheduler()->SetPageBackForwardCached(true); frame->GetPage()->GetPageScheduler()->SetPageFrozen(true); + frame->GetPage()->GetPageScheduler()->SetPageBackForwardCached(true); frame->HookBackForwardCacheEviction(); auto* script_state = ToScriptStateForMainWorld(frame);
diff --git a/third_party/blink/renderer/core/highlight/highlight_registry_map_entry.h b/third_party/blink/renderer/core/highlight/highlight_registry_map_entry.h index a54e1844..1137e39 100644 --- a/third_party/blink/renderer/core/highlight/highlight_registry_map_entry.h +++ b/third_party/blink/renderer/core/highlight/highlight_registry_map_entry.h
@@ -71,8 +71,8 @@ const blink::Member<blink::HighlightRegistryMapEntry>& a, const blink::Member<blink::HighlightRegistryMapEntry>& b) { DCHECK(a && b); - return HashTraits<AtomicString>::Equal(a->highlight_name, - b->highlight_name); + return HashTraits<blink::AtomicString>::Equal(a->highlight_name, + b->highlight_name); } static constexpr bool kSafeToCompareToEmptyOrDeleted = false;
diff --git a/third_party/blink/renderer/core/html/parser/literal_buffer.h b/third_party/blink/renderer/core/html/parser/literal_buffer.h index 0e08566..8573f172 100644 --- a/third_party/blink/renderer/core/html/parser/literal_buffer.h +++ b/third_party/blink/renderer/core/html/parser/literal_buffer.h
@@ -271,10 +271,10 @@ return String(*this); } - AtomicString AsAtomicString() const { - return AtomicString(*this, Is8Bit() - ? WTF::AtomicStringUCharEncoding::kIs8Bit - : WTF::AtomicStringUCharEncoding::kIs16Bit); + blink::AtomicString AsAtomicString() const { + return blink::AtomicString( + *this, Is8Bit() ? blink::AtomicStringUCharEncoding::kIs8Bit + : blink::AtomicStringUCharEncoding::kIs16Bit); } ALWAYS_INLINE bool Is8Bit() const {
diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc index 593cafa..97acc3f 100644 --- a/third_party/blink/renderer/core/loader/frame_loader.cc +++ b/third_party/blink/renderer/core/loader/frame_loader.cc
@@ -722,6 +722,28 @@ ShouldPerformFragmentNavigation( request.Form(), resource_request.HttpMethod(), frame_load_type, url); + if (RuntimeEnabledFeatures:: + TreatMhtmlInitialDocumentLoadsAsCrossDocumentEnabled()) { + if (auto* parent = DynamicTo<LocalFrame>(frame_->Tree().Parent())) { + // Within MHTML archives, treat the initial about:blank#fragment + // navigation as cross-document. Although it appears to be a same-document + // fragment navigation, it actually commits a new document with a new + // opaque origin. + // + // TODO(crbug.com/423663315): Consider refining this logic to only treat + // the initial about:blank#fragment navigation in MHTML as cross-document + // if the MHTML archive actually overrides the about:blank resource. If it + // doesn't, the navigation may be better treated as same-document, + // matching non-MHTML behavior. + if (parent->Loader().GetDocumentLoader()->HasBeenLoadedAsWebArchive()) { + if (url.HasFragmentIdentifier() && + frame_->GetDocument()->IsInitialEmptyDocument()) { + same_document_navigation = false; + } + } + } + } + // Perform same document navigation. if (same_document_navigation) { DCHECK(origin_window);
diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc index 0ecbc9e..59d45ba 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
@@ -617,7 +617,6 @@ // We only capture task types that are actually used. When you want to use a // new task type, add it here. static constexpr TaskType kAvailableTaskTypes[] = { - TaskType::kBackForwardCachePostedMessage, TaskType::kBackgroundFetch, TaskType::kCanvasBlobSerialization, TaskType::kDatabaseAccess,
diff --git a/third_party/blink/renderer/core/xml/xpath_grammar.y b/third_party/blink/renderer/core/xml/xpath_grammar.y index e42770c5e..addfb036 100644 --- a/third_party/blink/renderer/core/xml/xpath_grammar.y +++ b/third_party/blink/renderer/core/xml/xpath_grammar.y
@@ -203,8 +203,8 @@ | kNameTest OptionalPredicateList { - AtomicString local_name; - AtomicString namespace_uri; + blink::AtomicString local_name; + blink::AtomicString namespace_uri; if (!parser_->ExpandQName($1, local_name, namespace_uri)) { parser_->got_namespace_error_ = true; YYABORT; @@ -226,8 +226,8 @@ | AxisSpecifier kNameTest OptionalPredicateList { - AtomicString local_name; - AtomicString namespace_uri; + blink::AtomicString local_name; + blink::AtomicString namespace_uri; if (!parser_->ExpandQName($2, local_name, namespace_uri)) { parser_->got_namespace_error_ = true; YYABORT;
diff --git a/third_party/blink/renderer/core/xml/xpath_grammar_generated.cc b/third_party/blink/renderer/core/xml/xpath_grammar_generated.cc index 27cc117..25499e3 100644 --- a/third_party/blink/renderer/core/xml/xpath_grammar_generated.cc +++ b/third_party/blink/renderer/core/xml/xpath_grammar_generated.cc
@@ -1188,8 +1188,8 @@ case 12: // Step: kNameTest OptionalPredicateList #line 205 "third_party/blink/renderer/core/xml/xpath_grammar.y" { - AtomicString local_name; - AtomicString namespace_uri; + blink::AtomicString local_name; + blink::AtomicString namespace_uri; if (!parser_->ExpandQName(yystack_[1].value.as < String > (), local_name, namespace_uri)) { parser_->got_namespace_error_ = true; YYABORT; @@ -1217,8 +1217,8 @@ case 14: // Step: AxisSpecifier kNameTest OptionalPredicateList #line 228 "third_party/blink/renderer/core/xml/xpath_grammar.y" { - AtomicString local_name; - AtomicString namespace_uri; + blink::AtomicString local_name; + blink::AtomicString namespace_uri; if (!parser_->ExpandQName(yystack_[1].value.as < String > (), local_name, namespace_uri)) { parser_->got_namespace_error_ = true; YYABORT;
diff --git a/third_party/blink/renderer/modules/accessibility/ax_object.cc b/third_party/blink/renderer/modules/accessibility/ax_object.cc index 64f8796..98025262 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_object.cc
@@ -2838,9 +2838,9 @@ } // Interest for invoking elements (with the `interestfor` attribute) should -// have details relationships with their target, when that interest for is -// a) visible, b) is rich, and c) not the next element in the DOM (depth first -// search order). +// have details relationships with their target, when that interest target is +// a) a popover, b) visible, c) is "rich", and d) not the next element in the +// DOM (depth first search order). AXObject* AXObject::GetInterestForTargetPopover() const { if (!GetElement()) { return nullptr; @@ -2851,7 +2851,13 @@ return nullptr; } - Element* popover = GetElement()->InterestForElement(); + // Only return if the target is a popover. + HTMLElement* popover = + DynamicTo<HTMLElement>(GetElement()->InterestForElement()); + if (!popover || !popover->IsPopover()) { + return nullptr; + } + if (ElementTraversal::NextSkippingChildren(*GetElement()) == popover) { // The next element is already the popover. return nullptr;
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc index 4dc645d..b8530b7 100644 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
@@ -91,8 +91,8 @@ bool ShouldBlockScheme(const KURL& request_url) { // Require http(s), i.e. block data:, wss: and file: // https://github.com/WICG/background-fetch/issues/44 - return !request_url.ProtocolIs(WTF::g_http_atom) && - !request_url.ProtocolIs(WTF::g_https_atom); + return !request_url.ProtocolIs(g_http_atom) && + !request_url.ProtocolIs(g_https_atom); } bool ShouldBlockDanglingMarkup(const KURL& request_url) {
diff --git a/third_party/blink/renderer/platform/loader/unencoded_digest_fuzzer.cc b/third_party/blink/renderer/platform/loader/unencoded_digest_fuzzer.cc index 69d6640..c7e442c 100644 --- a/third_party/blink/renderer/platform/loader/unencoded_digest_fuzzer.cc +++ b/third_party/blink/renderer/platform/loader/unencoded_digest_fuzzer.cc
@@ -20,7 +20,8 @@ WTF::String header_value(input); blink::HTTPHeaderMap headers; - headers.Set(blink::http_names::kUnencodedDigest, AtomicString(header_value)); + headers.Set(blink::http_names::kUnencodedDigest, + blink::AtomicString(header_value)); auto result = blink::UnencodedDigest::Create(headers); } @@ -28,7 +29,7 @@ .WithDomains(fuzztest::PrintableAsciiString()); void MatchFuzzer(const std::string& arbitrary) { - AtomicString valid_header_value( + blink::AtomicString valid_header_value( "sha-256=:uU0nuZNNPgilLlLX2n2r+sSE7+N6U4DukIj3rOLvzek=:"); blink::HTTPHeaderMap headers; headers.Set(blink::http_names::kUnencodedDigest, valid_header_value);
diff --git a/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc b/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc index 4348f217..2923663 100644 --- a/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc +++ b/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc
@@ -39,8 +39,8 @@ terminated.shrink_to_fit(); blink::IsValidHTTPToken(terminated.c_str()); - blink::ParseCacheControlDirectives(AtomicString(terminated.c_str()), - AtomicString()); + blink::ParseCacheControlDirectives(blink::AtomicString(terminated.c_str()), + blink::AtomicString()); blink::ParseCommaDelimitedHeader(terminated.c_str(), set); blink::ParseHTTPRefresh(terminated.c_str(), nullptr, delay, url);
diff --git a/third_party/blink/renderer/platform/network/http_request_headers_mojom_traits.cc b/third_party/blink/renderer/platform/network/http_request_headers_mojom_traits.cc index 38f9651..70c6fe1 100644 --- a/third_party/blink/renderer/platform/network/http_request_headers_mojom_traits.cc +++ b/third_party/blink/renderer/platform/network/http_request_headers_mojom_traits.cc
@@ -38,8 +38,8 @@ } out->Clear(); for (const auto& header : headers) { - out->Set(AtomicString(header->key), - AtomicString(WTF::String(header->value))); + out->Set(blink::AtomicString(header->key), + blink::AtomicString(WTF::String(header->value))); } return true; }
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index ba7ae9f6..c86af6f 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3776,7 +3776,7 @@ // the buffer before resolving the read request. // https://chromestatus.com/feature/6396991665602560 name: "ReadableStreamBYOBReaderReadMinOption", - status: "experimental", + status: "stable", }, // If enabled, both Accept-Language HTTP header and JavaScript getter will // be reduced. @@ -4899,6 +4899,18 @@ status: "stable", }, { + // When enabled, treats the initial navigation to about:blank#fragment in + // an MHTML document as a cross-document navigation. + // + // Although it appears to be a same-document fragment navigation, MHTML + // loading replaces the initial empty document with a new committed + // document that has an opaque origin. + // + // This feature acts as a kill switch for https://crbug.com/40580002. + name: "TreatMhtmlInitialDocumentLoadsAsCrossDocument", + status: "stable", + }, + { // Ensures symbols are treated as word boundaries during traversal. // See https://crbug.com/40252642 name: "TreatSymbolsAsWordBoundary",
diff --git a/third_party/blink/renderer/platform/scheduler/common/tracing_helper.cc b/third_party/blink/renderer/platform/scheduler/common/tracing_helper.cc index 8872dd1..9ba3db64 100644 --- a/third_party/blink/renderer/platform/scheduler/common/tracing_helper.cc +++ b/third_party/blink/renderer/platform/scheduler/common/tracing_helper.cc
@@ -66,9 +66,6 @@ return RendererMainThreadTaskExecution::TASK_TYPE_WEB_SOCKET; case TaskType::kPostedMessage: return RendererMainThreadTaskExecution::TASK_TYPE_POSTED_MESSAGE; - case TaskType::kBackForwardCachePostedMessage: - return RendererMainThreadTaskExecution:: - TASK_TYPE_BACK_FORWARD_CACHE_POSTED_MESSAGE; case TaskType::kUnshippedPortMessage: return RendererMainThreadTaskExecution::TASK_TYPE_UNSHIPPED_PORT_MESSAGE; case TaskType::kFileReading:
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc index b25a8ea..6d63143 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
@@ -550,8 +550,6 @@ case TaskType::kInternalIntersectionObserver: case TaskType::kInternalAutofill: return PausableTaskQueueTraits(); - case TaskType::kBackForwardCachePostedMessage: - return PausableTaskQueueTraits().SetCanRunInBFCache(true); case TaskType::kInternalFindInPage: return FindInPageTaskQueueTraits(); case TaskType::kInternalHighPriorityLocalFrame: @@ -955,13 +953,6 @@ // will be resumed when the page is visible. bool queue_frozen = parent_page_scheduler_->IsFrozen() && queue->CanBeFrozen(); - // Override the frozen state for queues that should run while in BFCache. This - // allows tasks like eviction-triggering messages to be processed, while still - // freezing the queue for other reasons (e.g., to save resources). - if (queue_frozen && queue->CanRunInBFCache() && - parent_page_scheduler_->IsInBackForwardCache()) { - queue_frozen = false; - } queue_disabled |= queue_frozen; // Per-frame freezable queues of tasks which are specified as getting frozen // immediately when their frame becomes invisible get frozen. They will be
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc index 92a3c07..be6cbb5b 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
@@ -172,11 +172,10 @@ TaskType::kWebGPU, TaskType::kInternalPostMessageForwarding, TaskType::kInternalNavigationCancellation, - TaskType::kInternalAutofill, - TaskType::kBackForwardCachePostedMessage}; + TaskType::kInternalAutofill}; static_assert( - static_cast<int>(TaskType::kMaxValue) == 89, + static_cast<int>(TaskType::kMaxValue) == 88, "When adding a TaskType, make sure that kAllFrameTaskTypes is updated."); void AppendToVectorTestTask(Vector<String>* vector, String value) { @@ -301,20 +300,14 @@ void StorePageInBackForwardCache() { page_scheduler_->SetPageVisible(false); - // Set the BFCache state before freezing the page. The scheduler policy - // update, triggered by SetPageFrozen(), depends on this state to correctly - // handle queues that can run in BFCache. - page_scheduler_->SetPageBackForwardCached(true); page_scheduler_->SetPageFrozen(true); + page_scheduler_->SetPageBackForwardCached(true); } void RestorePageFromBackForwardCache() { page_scheduler_->SetPageVisible(true); - // Set the BFCache state before freezing the page. The scheduler policy - // update, triggered by SetPageFrozen(), depends on this state to correctly - // handle queues that can run in BFCache. - page_scheduler_->SetPageBackForwardCached(false); page_scheduler_->SetPageFrozen(false); + page_scheduler_->SetPageBackForwardCached(false); } void TearDown() override { @@ -1070,49 +1063,6 @@ EXPECT_EQ(5, counter); } -TEST_F(FrameSchedulerImplTest, CanRunInBFCache_RunsWhenInBFCache) { - int counter = 0; - GetTaskQueue(TaskType::kBackForwardCachePostedMessage) - ->GetTaskRunnerWithDefaultTaskType() - ->PostTask(FROM_HERE, - base::BindOnce(&IncrementCounter, base::Unretained(&counter))); - PausableTaskQueue()->GetTaskRunnerWithDefaultTaskType()->PostTask( - FROM_HERE, base::BindOnce(&IncrementCounter, base::Unretained(&counter))); - - StorePageInBackForwardCache(); - - base::RunLoop().RunUntilIdle(); - - EXPECT_EQ(1, counter); - - RestorePageFromBackForwardCache(); - task_environment_.FastForwardUntilNoTasksRemain(); - - EXPECT_EQ(2, counter); -} - -TEST_F(FrameSchedulerImplTest, CanRunInBFCache_IsFrozenWhenNotInBFCache) { - int counter = 0; - GetTaskQueue(TaskType::kBackForwardCachePostedMessage) - ->GetTaskRunnerWithDefaultTaskType() - ->PostTask(FROM_HERE, - base::BindOnce(&IncrementCounter, base::Unretained(&counter))); - PausableTaskQueue()->GetTaskRunnerWithDefaultTaskType()->PostTask( - FROM_HERE, base::BindOnce(&IncrementCounter, base::Unretained(&counter))); - - page_scheduler_->SetPageVisible(false); - page_scheduler_->SetPageFrozen(true); - - base::RunLoop().RunUntilIdle(); - - EXPECT_EQ(0, counter); - - page_scheduler_->SetPageFrozen(false); - task_environment_.FastForwardUntilNoTasksRemain(); - - EXPECT_EQ(2, counter); -} - TEST_F(FrameSchedulerImplTest, PagePostsCpuTasks) { EXPECT_TRUE(GetUnreportedTaskTime().is_zero()); EXPECT_EQ(0, GetTotalUpdateTaskTimeCalls());
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h index 444bb6a1..ff101bf 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h
@@ -226,11 +226,6 @@ return *this; } - QueueTraits SetCanRunInBFCache(bool value) { - can_run_in_bfcache = value; - return *this; - } - QueueTraits SetPrioritisationType(PrioritisationType type) { prioritisation_type = type; return *this; @@ -257,7 +252,6 @@ key |= can_be_frozen << (offset++); key |= can_run_in_background << (offset++); key |= can_run_when_virtual_time_paused << (offset++); - key |= can_run_in_bfcache << (offset++); key |= can_be_paused_for_android_webview << (offset++); key |= static_cast<int>(prioritisation_type) << offset; offset += kPrioritisationTypeWidthBits; @@ -274,13 +268,6 @@ bool can_be_frozen : 1 = false; bool can_run_in_background : 1 = true; bool can_run_when_virtual_time_paused : 1 = true; - // Normally, a freezable task queue is paused when its page is frozen. A - // page can be frozen when it enters the Back-Forward Cache, or when the - // browser freezes pages to save resources. This flag marks tasks that - // should run only when the page is frozen for BFCache. This is useful for - // tasks that need to evict the page from BFCache, e.g., a message from a - // SharedWorker. - bool can_run_in_bfcache : 1 = false; bool can_be_paused_for_android_webview : 1 = false; PrioritisationType prioritisation_type = PrioritisationType::kRegular; }; @@ -356,12 +343,6 @@ return *this; } - QueueCreationParams SetCanRunInBFCache(bool value) { - queue_traits = queue_traits.SetCanRunInBFCache(value); - ApplyQueueTraitsToSpec(); - return *this; - } - QueueCreationParams SetPrioritisationType( QueueTraits::PrioritisationType type) { queue_traits = queue_traits.SetPrioritisationType(type); @@ -447,8 +428,6 @@ return queue_traits_.can_run_when_virtual_time_paused; } - bool CanRunInBFCache() const { return queue_traits_.can_run_in_bfcache; } - QueueTraits GetQueueTraits() const { return queue_traits_; } QueueTraits::PrioritisationType GetPrioritisationType() const {
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc index 3033c2cc..cb4107e 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
@@ -297,12 +297,6 @@ "PageSchedulerImpl::SetPageBackForwardCached_Restore"); stored_in_back_forward_cache_timestamp_ = base::TimeTicks(); } else { - // When storing a page in BFCache, call this function before calling - // SetPageFrozen(). The policy update triggered by SetPageFrozen() depends - // on the state set here to keep BFCache-runnable tasks from being frozen. - // TODO(crbug.com/427130212): Remove this CHECK once the lifecycle state - // logic is refactored to make this dependency unnecessary. - CHECK(!is_frozen_); TRACE_EVENT_INSTANT("navigation", "PageSchedulerImpl::SetPageBackForwardCached_Store"); stored_in_back_forward_cache_timestamp_ =
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/task_type_names.cc b/third_party/blink/renderer/platform/scheduler/main_thread/task_type_names.cc index f8a1b7c..04240bd3 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/task_type_names.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/task_type_names.cc
@@ -51,8 +51,6 @@ return "WebSocket"; case TaskType::kPostedMessage: return "PostedMessage"; - case TaskType::kBackForwardCachePostedMessage: - return "BackForwardCachePostedMessage"; case TaskType::kUnshippedPortMessage: return "UnshippedPortMessage"; case TaskType::kFileReading:
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl.cc index d13d79c3..10c9e80 100644 --- a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl.cc +++ b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl.cc
@@ -156,7 +156,6 @@ case TaskType::kJavascriptTimerDelayedLowNesting: case TaskType::kJavascriptTimerDelayedHighNesting: case TaskType::kPostedMessage: - case TaskType::kBackForwardCachePostedMessage: case TaskType::kWorkerAnimation: return throttleable_task_queue_->CreateTaskRunner(type); case TaskType::kNetworking:
diff --git a/third_party/blink/renderer/platform/text/layout_locale_fuzzer.cc b/third_party/blink/renderer/platform/text/layout_locale_fuzzer.cc index da035dca..956ec32 100644 --- a/third_party/blink/renderer/platform/text/layout_locale_fuzzer.cc +++ b/third_party/blink/renderer/platform/text/layout_locale_fuzzer.cc
@@ -29,7 +29,7 @@ if (use_default) { locale = &blink::LayoutLocale::GetDefault(); } else { - locale = blink::LayoutLocale::Get(AtomicString(maybe_locale)); + locale = blink::LayoutLocale::Get(blink::AtomicString(maybe_locale)); } if (!locale) { @@ -42,7 +42,7 @@ return 0; } - auto string_data = AtomicString( + auto string_data = blink::AtomicString( fuzzed_data.ConsumeRandomLengthString(fuzzed_data.RemainingBytes())); std::ignore = hyphen->HyphenLocations(string_data);
diff --git a/third_party/blink/renderer/platform/weborigin/kurl.cc b/third_party/blink/renderer/platform/weborigin/kurl.cc index 85f4503d..3750a9f 100644 --- a/third_party/blink/renderer/platform/weborigin/kurl.cc +++ b/third_party/blink/renderer/platform/weborigin/kurl.cc
@@ -974,10 +974,10 @@ DCHECK(!string_.IsNull()); StringView protocol = ComponentStringView(parsed_.scheme); protocol_is_in_http_family_ = true; - if (protocol == WTF::g_https_atom) { - protocol_ = WTF::g_https_atom; - } else if (protocol == WTF::g_http_atom) { - protocol_ = WTF::g_http_atom; + if (protocol == g_https_atom) { + protocol_ = g_https_atom; + } else if (protocol == g_http_atom) { + protocol_ = g_http_atom; } else { protocol_ = protocol.ToAtomicString(); protocol_is_in_http_family_ = false;
diff --git a/third_party/blink/renderer/platform/wtf/cross_thread_copier.h b/third_party/blink/renderer/platform/wtf/cross_thread_copier.h index 8fa9024..886529a 100644 --- a/third_party/blink/renderer/platform/wtf/cross_thread_copier.h +++ b/third_party/blink/renderer/platform/wtf/cross_thread_copier.h
@@ -113,8 +113,8 @@ }; template <> -struct CrossThreadCopier<AtomicString> - : public CrossThreadCopierPassThrough<AtomicString> { +struct CrossThreadCopier<blink::AtomicString> + : public CrossThreadCopierPassThrough<blink::AtomicString> { STATIC_ONLY(CrossThreadCopier); };
diff --git a/third_party/blink/renderer/platform/wtf/forward.h b/third_party/blink/renderer/platform/wtf/forward.h index a79ddeb..96c503b 100644 --- a/third_party/blink/renderer/platform/wtf/forward.h +++ b/third_party/blink/renderer/platform/wtf/forward.h
@@ -31,6 +31,7 @@ namespace blink { +class AtomicString; class StringBuilder; template <typename T> @@ -46,7 +47,6 @@ typename Allocator = PartitionAllocator> class Vector; -class AtomicString; class OrdinalNumber; class SegmentedBuffer; class SharedBuffer; @@ -58,7 +58,6 @@ using WTF::Vector; -using WTF::AtomicString; using WTF::SegmentedBuffer; using WTF::SharedBuffer; using WTF::String;
diff --git a/third_party/blink/renderer/platform/wtf/hash_map_test.cc b/third_party/blink/renderer/platform/wtf/hash_map_test.cc index 6ba29d2..c65eeb5 100644 --- a/third_party/blink/renderer/platform/wtf/hash_map_test.cc +++ b/third_party/blink/renderer/platform/wtf/hash_map_test.cc
@@ -597,6 +597,7 @@ } TEST(HashMapTest, IsValidKey) { + using blink::AtomicString; static_assert(HashTraits<int>::kSafeToCompareToEmptyOrDeleted, "type should be comparable to empty or deleted"); static_assert(HashTraits<int*>::kSafeToCompareToEmptyOrDeleted,
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string.cc b/third_party/blink/renderer/platform/wtf/text/atomic_string.cc index 8f8f94e..78491d2d 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string.cc +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string.cc
@@ -36,7 +36,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_impl.h" #include "third_party/perfetto/include/perfetto/tracing/traced_value.h" -namespace WTF { +namespace blink { ASSERT_SIZE(AtomicString, String); @@ -137,4 +137,4 @@ } #endif -} // namespace WTF +} // namespace blink
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string.h b/third_party/blink/renderer/platform/wtf/text/atomic_string.h index a0dd35f..4d543259 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string.h +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string.h
@@ -29,6 +29,7 @@ #include "base/containers/span.h" #include "build/build_config.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" +#include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/hash_table_deleted_value_type.h" #include "third_party/blink/renderer/platform/wtf/ref_counted.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string_encoding.h" @@ -38,18 +39,14 @@ #include "third_party/blink/renderer/platform/wtf/wtf_export.h" #include "third_party/perfetto/include/perfetto/tracing/traced_value_forward.h" -namespace WTF { -class WTF_EXPORT AtomicString; -} - // `AtomicString` is interned, so it's safe to hash; allow conversion to a byte // span to facilitate this. namespace base { template <> -inline constexpr bool kCanSafelyConvertToByteSpan<::WTF::AtomicString> = true; +inline constexpr bool kCanSafelyConvertToByteSpan<::blink::AtomicString> = true; } -namespace WTF { +namespace blink { // An AtomicString instance represents a string, and multiple AtomicString // instances can share their string storage if the strings are @@ -109,7 +106,7 @@ wtf_size_t find(char c, wtf_size_t start = 0) const { return find(static_cast<LChar>(c), start); } - wtf_size_t Find(CharacterMatchFunctionPtr match_function, + wtf_size_t Find(WTF::CharacterMatchFunctionPtr match_function, wtf_size_t start = 0) const { return string_.Find(match_function, start); } @@ -192,7 +189,7 @@ template <typename IntegerType> static AtomicString Number(IntegerType number) { - IntegerToStringConverter<IntegerType> converter(number); + WTF::IntegerToStringConverter<IntegerType> converter(number); return AtomicString(converter.Span()); } @@ -261,7 +258,7 @@ return b == a; } inline bool operator==(const AtomicString& a, const char* b) { - return EqualStringView(a, b); + return WTF::EqualStringView(a, b); } inline bool operator==(const char* a, const AtomicString& b) { return b == a; @@ -294,24 +291,28 @@ WTF_EXPORT extern const AtomicString& g_http_atom; WTF_EXPORT extern const AtomicString& g_https_atom; -template <typename T> -struct HashTraits; -// Defined in atomic_string_hash.h. -template <> -struct HashTraits<AtomicString>; - // Pretty printer for gtest and base/logging.*. It prepends and appends // double-quotes, and escapes characters other than ASCII printables. WTF_EXPORT std::ostream& operator<<(std::ostream&, const AtomicString&); -inline StringView::StringView(const AtomicString& string LIFETIME_BOUND, +} // namespace blink + +namespace WTF { + +template <typename T> +struct HashTraits; +// Defined in atomic_string_hash.h. +template <> +struct HashTraits<blink::AtomicString>; + +inline StringView::StringView(const blink::AtomicString& string LIFETIME_BOUND, unsigned offset, unsigned length) : StringView(string.Impl(), offset, length) {} -inline StringView::StringView(const AtomicString& string LIFETIME_BOUND, +inline StringView::StringView(const blink::AtomicString& string LIFETIME_BOUND, unsigned offset) : StringView(string.Impl(), offset) {} -inline StringView::StringView(const AtomicString& string LIFETIME_BOUND) +inline StringView::StringView(const blink::AtomicString& string LIFETIME_BOUND) : StringView(string.Impl()) {} } // namespace WTF @@ -327,24 +328,16 @@ // Without this, the `find()` call above would fail to compile with a cryptic // error about being unable to invoke `std::ranges::equal_to()`. template <template <typename> typename TQ, template <typename> typename UQ> -struct std::basic_common_reference<WTF::AtomicString, const char*, TQ, UQ> { +struct std::basic_common_reference<blink::AtomicString, const char*, TQ, UQ> { using type = WTF::String; }; template <template <typename> typename TQ, template <typename> typename UQ> -struct std::basic_common_reference<const char*, WTF::AtomicString, TQ, UQ> { +struct std::basic_common_reference<const char*, blink::AtomicString, TQ, UQ> { using type = WTF::String; }; -WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(AtomicString) - -using WTF::AtomicString; -using WTF::g_null_atom; -using WTF::g_empty_atom; -using WTF::g_star_atom; -using WTF::g_xml_atom; -using WTF::g_xmlns_atom; -using WTF::g_xlink_atom; +WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::AtomicString) #include "third_party/blink/renderer/platform/wtf/text/string_operators_atomic.h" #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_H_
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_encoding.h b/third_party/blink/renderer/platform/wtf/text/atomic_string_encoding.h index 4425b257..44e7e626 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_encoding.h +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_encoding.h
@@ -5,7 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_ENCODING_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_ENCODING_H_ -namespace WTF { +namespace blink { enum class AtomicStringUCharEncoding { kUnknown, @@ -17,6 +17,6 @@ kIs16Bit, }; -} // namespace WTF +} // namespace blink #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_ENCODING_H_
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h b/third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h index f8a0b55..fd70abab 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h
@@ -36,25 +36,28 @@ namespace WTF { template <> -struct HashTraits<AtomicString> : SimpleClassHashTraits<AtomicString> { - static unsigned GetHash(const AtomicString& key) { return key.Hash(); } +struct HashTraits<blink::AtomicString> + : SimpleClassHashTraits<blink::AtomicString> { + static unsigned GetHash(const blink::AtomicString& key) { return key.Hash(); } static constexpr bool kSafeToCompareToEmptyOrDeleted = false; // Unlike other types, we can return a const reference for AtomicString's // empty value (g_null_atom). - typedef const AtomicString& PeekOutType; + typedef const blink::AtomicString& PeekOutType; - static const AtomicString& EmptyValue() { return g_null_atom; } - static PeekOutType Peek(const AtomicString& value) { return value; } + static const blink::AtomicString& EmptyValue() { return blink::g_null_atom; } + static PeekOutType Peek(const blink::AtomicString& value) { return value; } - static bool IsEmptyValue(const AtomicString& value) { return value.IsNull(); } + static bool IsEmptyValue(const blink::AtomicString& value) { + return value.IsNull(); + } - static bool IsDeletedValue(const AtomicString& value) { + static bool IsDeletedValue(const blink::AtomicString& value) { return HashTraits<String>::IsDeletedValue(value.string_); } - static void ConstructDeletedValue(AtomicString& slot) { + static void ConstructDeletedValue(blink::AtomicString& slot) { HashTraits<String>::ConstructDeletedValue(slot.string_); } };
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_table.cc b/third_party/blink/renderer/platform/wtf/text/atomic_string_table.cc index 98a730a..d6ef32e 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_table.cc +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_table.cc
@@ -17,7 +17,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/utf8.h" -namespace WTF { +namespace blink { namespace { @@ -38,7 +38,7 @@ // This is a very common case from HTML parsing, so we take // the size penalty from inlining. return StringHasher::ComputeHashAndMaskTop8BitsInline< - ConvertTo8BitHashReader>((const char*)chars, len); + WTF::ConvertTo8BitHashReader>((const char*)chars, len); } else { return StringHasher::ComputeHashAndMaskTop8Bits((const char*)chars, len * 2); @@ -103,7 +103,8 @@ return StringHasher::ComputeHashAndMaskTop8Bits( base::as_chars(buf.Span8()).data(), buf.length()); } else if (IsOnly8Bit(buf.Span16())) { - return StringHasher::ComputeHashAndMaskTop8Bits<ConvertTo8BitHashReader>( + return StringHasher::ComputeHashAndMaskTop8Bits< + WTF::ConvertTo8BitHashReader>( base::as_chars(buf.RawByteSpan()).data(), buf.length()); } else { return StringHasher::ComputeHashAndMaskTop8Bits( @@ -504,4 +505,4 @@ return true; } -} // namespace WTF +} // namespace blink
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_table.h b/third_party/blink/renderer/platform/wtf/text/atomic_string_table.h index 356d7b3..4a32b711 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_table.h +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_table.h
@@ -14,7 +14,7 @@ #include "third_party/blink/renderer/platform/wtf/threading.h" #include "third_party/blink/renderer/platform/wtf/wtf_export.h" -namespace WTF { +namespace blink { // The underlying storage that keeps the map of unique AtomicStrings. This is // thread safe and there is a single table for all threads. Adding and removing @@ -157,8 +157,6 @@ return lhs.Impl() == rhs; } -} // namespace WTF - -using WTF::AtomicStringTable; +} // namespace blink #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_ATOMIC_STRING_TABLE_H_
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_table_test.cc b/third_party/blink/renderer/platform/wtf/text/atomic_string_table_test.cc index 66cdb04..fff771e 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_table_test.cc +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_table_test.cc
@@ -6,7 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" -namespace WTF { +namespace blink { TEST(WeakResultTest, BasicOperations) { AtomicStringTable::WeakResult null; @@ -47,7 +47,7 @@ EXPECT_EQ(foo_unicode.Utf8(), "foo😀"); AtomicStringTable::WeakResult result = - WTF::AtomicStringTable::Instance().WeakFindLowercase(AtomicString("FOO")); + AtomicStringTable::Instance().WeakFindLowercase(AtomicString("FOO")); EXPECT_FALSE(result.IsNull()); // This is a particularly icky case; a 16-bit AtomicString that contains @@ -55,28 +55,28 @@ // added directly to the AtomicStringTable. String too_wide_string("Foo"); too_wide_string.Ensure16Bit(); - result = WTF::AtomicStringTable::Instance().WeakFindLowercase( + result = AtomicStringTable::Instance().WeakFindLowercase( AtomicString(too_wide_string.Impl())); EXPECT_FALSE(result.IsNull()); AtomicStringTable::WeakResult result_latin1 = - WTF::AtomicStringTable::Instance().WeakFindLowercase( + AtomicStringTable::Instance().WeakFindLowercase( AtomicString::FromUTF8("Foó")); EXPECT_FALSE(result_latin1.IsNull()); // Only ASCII is lowercased. - result_latin1 = WTF::AtomicStringTable::Instance().WeakFindLowercase( + result_latin1 = AtomicStringTable::Instance().WeakFindLowercase( AtomicString::FromUTF8("FoÓ")); EXPECT_TRUE(result_latin1.IsNull()); AtomicStringTable::WeakResult result_unicode = - WTF::AtomicStringTable::Instance().WeakFindLowercase( + AtomicStringTable::Instance().WeakFindLowercase( AtomicString::FromUTF8("foO😀")); EXPECT_FALSE(result_unicode.IsNull()); - result_unicode = WTF::AtomicStringTable::Instance().WeakFindLowercase( + result_unicode = AtomicStringTable::Instance().WeakFindLowercase( AtomicString::FromUTF8("Goo😀")); EXPECT_TRUE(result_unicode.IsNull()); } -} // namespace WTF +} // namespace blink
diff --git a/third_party/blink/renderer/platform/wtf/text/atomic_string_test.cc b/third_party/blink/renderer/platform/wtf/text/atomic_string_test.cc index 84e0fc5..d91f195d 100644 --- a/third_party/blink/renderer/platform/wtf/text/atomic_string_test.cc +++ b/third_party/blink/renderer/platform/wtf/text/atomic_string_test.cc
@@ -32,7 +32,7 @@ #include "testing/gtest/include/gtest/gtest.h" -namespace WTF { +namespace blink { TEST(AtomicStringTest, Number) { int16_t int_value = 1234; @@ -75,4 +75,4 @@ EXPECT_NE(bar.Impl(), baz.Impl()); } -} // namespace WTF +} // namespace blink
diff --git a/third_party/blink/renderer/platform/wtf/text/case_folding_hash.h b/third_party/blink/renderer/platform/wtf/text/case_folding_hash.h index 3479927..65f5ed51 100644 --- a/third_party/blink/renderer/platform/wtf/text/case_folding_hash.h +++ b/third_party/blink/renderer/platform/wtf/text/case_folding_hash.h
@@ -150,13 +150,14 @@ } static unsigned GetHash(const String& key) { return GetHash(key.Impl()); } - static unsigned GetHash(const AtomicString& key) { + static unsigned GetHash(const blink::AtomicString& key) { return GetHash(key.Impl()); } static bool Equal(const String& a, const String& b) { return Equal(a.Impl(), b.Impl()); } - static bool Equal(const AtomicString& a, const AtomicString& b) { + static bool Equal(const blink::AtomicString& a, + const blink::AtomicString& b) { return (a == b) || Equal(a.Impl(), b.Impl()); }
diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.cc b/third_party/blink/renderer/platform/wtf/text/string_impl.cc index a1f36254..cfced35 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_impl.cc +++ b/third_party/blink/renderer/platform/wtf/text/string_impl.cc
@@ -146,7 +146,7 @@ void StringImpl::DestroyIfNeeded() const { if (hash_and_flags_.load(std::memory_order_acquire) & kIsAtomic) { // TODO: Remove const_cast - if (AtomicStringTable::Instance().ReleaseAndRemoveIfNeeded( + if (blink::AtomicStringTable::Instance().ReleaseAndRemoveIfNeeded( const_cast<StringImpl*>(this))) { delete this; } else {
diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h index be2db40..ebe941e 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_impl.h +++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h
@@ -61,6 +61,10 @@ @class NSString; #endif +namespace blink { +class AtomicStringTable; +} // namespace blink + namespace WTF { enum TextCaseSensitivity { @@ -506,7 +510,7 @@ static const std::array<UChar, 256> kLatin1CaseFoldTable; private: - friend class AtomicStringTable; + friend class blink::AtomicStringTable; enum Flags { // These two fields are never modified for the lifetime of the StringImpl. // It is therefore safe to read them with a relaxed operation.
diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl_test.cc b/third_party/blink/renderer/platform/wtf/text/string_impl_test.cc index 96b788f..0810060 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_impl_test.cc +++ b/third_party/blink/renderer/platform/wtf/text/string_impl_test.cc
@@ -64,7 +64,7 @@ test_string_impl.get(), StringImpl::Create(base::span_from_cstring("lInk"))->LowerASCII().get())); - blink::CaseMap case_map(g_empty_atom); + blink::CaseMap case_map(blink::g_empty_atom); EXPECT_TRUE(Equal( case_map.ToLower(StringImpl::Create(base::span_from_cstring("LINK"))) .Impl(), @@ -137,7 +137,7 @@ test_string_impl.get(), StringImpl::Create(base::span_from_cstring("lInk"))->UpperASCII().get())); - blink::CaseMap case_map(g_empty_atom); + blink::CaseMap case_map(blink::g_empty_atom); EXPECT_TRUE(Equal( case_map.ToUpper(StringImpl::Create(base::span_from_cstring("LINK"))) .Impl(),
diff --git a/third_party/blink/renderer/platform/wtf/text/string_statics.cc b/third_party/blink/renderer/platform/wtf/text/string_statics.cc index 33a99ce7..d4ec005 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_statics.cc +++ b/third_party/blink/renderer/platform/wtf/text/string_statics.cc
@@ -41,7 +41,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_impl.h" #include "third_party/blink/renderer/platform/wtf/wtf.h" -namespace WTF { +namespace blink { DEFINE_GLOBAL(WTF_EXPORT, AtomicString, g_null_atom); DEFINE_GLOBAL(WTF_EXPORT, AtomicString, g_empty_atom); @@ -52,6 +52,10 @@ DEFINE_GLOBAL(WTF_EXPORT, AtomicString, g_http_atom); DEFINE_GLOBAL(WTF_EXPORT, AtomicString, g_https_atom); +} // namespace blink + +namespace WTF { + // This is not an AtomicString because it is unlikely to be used as an // event/element/attribute name, so it shouldn't pollute the AtomicString hash // table. @@ -99,6 +103,9 @@ return ExistingHash(); } +} // namespace WTF +namespace blink { + void AtomicString::Init() { DCHECK(IsMainThread()); @@ -106,6 +113,9 @@ new (base::NotNullTag::kNotNull, (void*)&g_empty_atom) AtomicString(""); } +} // namespace blink +namespace WTF { + scoped_refptr<StringImpl> AddStaticASCIILiteral( base::span<const char> literal) { return base::AdoptRef(StringImpl::CreateStatic(literal)); @@ -120,7 +130,7 @@ auto* string_impl = StringImpl::CreateStatic(base::span(whitespace_buffer).first(length)); new (base::NotNullTag::kNotNull, (void*)(&g_table_[length])) - String(AtomicString(string_impl).GetString()); + String(blink::AtomicString(string_impl).GetString()); } } @@ -149,18 +159,20 @@ new (base::NotNullTag::kNotNull, (void*)&g_empty_string16_bit) String(StringImpl::empty16_bit_); + using blink::AtomicString; // FIXME: These should be allocated at compile time. - new (base::NotNullTag::kNotNull, (void*)&g_star_atom) AtomicString("*"); - new (base::NotNullTag::kNotNull, (void*)&g_xml_atom) + new (base::NotNullTag::kNotNull, (void*)&blink::g_star_atom) + AtomicString("*"); + new (base::NotNullTag::kNotNull, (void*)&blink::g_xml_atom) AtomicString(AddStaticASCIILiteral(base::span_from_cstring("xml"))); - new (base::NotNullTag::kNotNull, (void*)&g_xmlns_atom) + new (base::NotNullTag::kNotNull, (void*)&blink::g_xmlns_atom) AtomicString(AddStaticASCIILiteral(base::span_from_cstring("xmlns"))); - new (base::NotNullTag::kNotNull, (void*)&g_xlink_atom) + new (base::NotNullTag::kNotNull, (void*)&blink::g_xlink_atom) AtomicString(AddStaticASCIILiteral(base::span_from_cstring("xlink"))); new (base::NotNullTag::kNotNull, (void*)&g_xmlns_with_colon) String("xmlns:"); - new (base::NotNullTag::kNotNull, (void*)&g_http_atom) + new (base::NotNullTag::kNotNull, (void*)&blink::g_http_atom) AtomicString(AddStaticASCIILiteral(base::span_from_cstring("http"))); - new (base::NotNullTag::kNotNull, (void*)&g_https_atom) + new (base::NotNullTag::kNotNull, (void*)&blink::g_https_atom) AtomicString(AddStaticASCIILiteral(base::span_from_cstring("https"))); NewlineThenWhitespaceStringsTable::Init();
diff --git a/third_party/blink/renderer/platform/wtf/text/string_view.cc b/third_party/blink/renderer/platform/wtf/text/string_view.cc index cf1b6811ae..eaf947c 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_view.cc +++ b/third_party/blink/renderer/platform/wtf/text/string_view.cc
@@ -203,16 +203,16 @@ return StringImpl::Create8BitIfPossible(Span16()); } -AtomicString StringView::ToAtomicString() const { +blink::AtomicString StringView::ToAtomicString() const { if (IsNull()) - return g_null_atom; + return blink::g_null_atom; if (empty()) - return g_empty_atom; + return blink::g_empty_atom; if (StringImpl* impl = SharedImpl()) - return AtomicString(impl); + return blink::AtomicString(impl); if (Is8Bit()) - return AtomicString(Span8()); - return AtomicString(Span16()); + return blink::AtomicString(Span8()); + return blink::AtomicString(Span16()); } String StringView::EncodeForDebugging() const {
diff --git a/third_party/blink/renderer/platform/wtf/text/string_view.h b/third_party/blink/renderer/platform/wtf/text/string_view.h index f59ddcb5..924964de 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_view.h +++ b/third_party/blink/renderer/platform/wtf/text/string_view.h
@@ -18,6 +18,7 @@ #include "base/dcheck_is_on.h" #include "base/numerics/safe_conversions.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" +#include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/get_ptr.h" #include "third_party/blink/renderer/platform/wtf/text/string_impl.h" @@ -31,9 +32,6 @@ namespace WTF { -class AtomicString; -class String; - enum class Utf8ConversionMode : uint8_t { // Unpaired surrogates are encoded using the standard UTF-8 encoding scheme, // even though surrogate characters should not be present in a valid UTF-8 @@ -138,12 +136,13 @@ inline StringView(const String& string LIFETIME_BOUND); // From an AtomicString, implemented in atomic_string.h - inline StringView(const AtomicString& string LIFETIME_BOUND, + inline StringView(const blink::AtomicString& string LIFETIME_BOUND, unsigned offset, unsigned length); - inline StringView(const AtomicString& string LIFETIME_BOUND, unsigned offset); + inline StringView(const blink::AtomicString& string LIFETIME_BOUND, + unsigned offset); // NOLINTNEXTLINE(google-explicit-constructor) - inline StringView(const AtomicString& string LIFETIME_BOUND); + inline StringView(const blink::AtomicString& string LIFETIME_BOUND); // From a literal string or LChar buffer: explicit StringView(base::span<const LChar> chars) @@ -275,7 +274,7 @@ StringView LowerASCIIMaybeUsingBuffer(StackBackingStore& backing_store) const; String ToString() const; - AtomicString ToAtomicString() const; + blink::AtomicString ToAtomicString() const; // Returns a version suitable for gtest and base/logging.*. It prepends and // appends double-quotes, and escapes characters other than ASCII printables.
diff --git a/third_party/blink/renderer/platform/wtf/text/string_view_nocompile.nc b/third_party/blink/renderer/platform/wtf/text/string_view_nocompile.nc index f86e22b3..0acf689f 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_view_nocompile.nc +++ b/third_party/blink/renderer/platform/wtf/text/string_view_nocompile.nc
@@ -31,11 +31,11 @@ } WTF::StringView CannotReturnStringViewOfLocalAtomicString() { - WTF::AtomicString local_string{}; + blink::AtomicString local_string{}; return local_string; // expected-error {{address of stack memory associated with local variable 'local_string' returned}} } -WTF::AtomicString ReturnsAnAtomicString() { +blink::AtomicString ReturnsAnAtomicString() { return {}; }
diff --git a/third_party/blink/renderer/platform/wtf/text/string_view_test.cc b/third_party/blink/renderer/platform/wtf/text/string_view_test.cc index 08405f9a..38861253 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_view_test.cc +++ b/third_party/blink/renderer/platform/wtf/text/string_view_test.cc
@@ -16,6 +16,10 @@ namespace WTF { +using blink::AtomicString; +using blink::g_empty_atom; +using blink::g_null_atom; + const char kChars[] = "12345"; const char16_t kCharsU[] = u"12345"; const LChar* const kChars8 = reinterpret_cast<const LChar*>(kChars);
diff --git a/third_party/blink/renderer/platform/wtf/wtf.cc b/third_party/blink/renderer/platform/wtf/wtf.cc index e08a6d6..c475074 100644 --- a/third_party/blink/renderer/platform/wtf/wtf.cc +++ b/third_party/blink/renderer/platform/wtf/wtf.cc
@@ -84,7 +84,7 @@ internal::InitializeDoubleConverter(); internal::InitializeMainThreadStackEstimate(); - AtomicString::Init(); + blink::AtomicString::Init(); StringStatics::Init(); }
diff --git a/third_party/blink/tools/gdb/blink.py b/third_party/blink/tools/gdb/blink.py index 1e43fc7..8b3c337 100644 --- a/third_party/blink/tools/gdb/blink.py +++ b/third_party/blink/tools/gdb/blink.py
@@ -135,8 +135,8 @@ return lstring_to_string(self.val) -class WTFAtomicStringPrinter(StringPrinter): - "Print a WTF::AtomicString" +class BlinkAtomicStringPrinter(StringPrinter): + "Print a blink::AtomicString" def to_string(self): return self.val['string_'] @@ -184,7 +184,7 @@ "Print a blink::KURL" def to_string(self): - return WTFAtomicStringPrinter(self.val['string_']).to_string() + return BlinkAtomicStringPrinter(self.val['string_']).to_string() class blinkLayoutUnitPrinter: @@ -492,9 +492,9 @@ pretty_printers = ( (re.compile("^WTF::Vector<.*>$"), WTFVectorPrinter), (re.compile("^WTF::HashTable<.*>$"), WTFHashTablePrinter), - (re.compile("^WTF::AtomicString$"), WTFAtomicStringPrinter), (re.compile("^WTF::String$"), WTFStringPrinter), (re.compile("^WTF::StringImpl$"), WTFStringImplPrinter), + (re.compile("^blink::AtomicString$"), BlinkAtomicStringPrinter), (re.compile("^blink::FixedPoint<.*>$"), blinkFixedPointPrinter), (re.compile("^blink::KURL$"), blinkKURLPrinter), (re.compile("^blink::LayoutUnit$"), blinkLayoutUnitPrinter),
diff --git a/third_party/blink/tools/lldb/lldb_blink.py b/third_party/blink/tools/lldb/lldb_blink.py index 790b112..26bec33 100644 --- a/third_party/blink/tools/lldb/lldb_blink.py +++ b/third_party/blink/tools/lldb/lldb_blink.py
@@ -40,7 +40,7 @@ 'type summary add --expand -F lldb_blink.WTFStringImpl_SummaryProvider WTF::StringImpl' ) debugger.HandleCommand( - 'type summary add --expand -F lldb_blink.WTFAtomicString_SummaryProvider WTF::AtomicString' + 'type summary add --expand -F lldb_blink.BlinkAtomicString_SummaryProvider blink::AtomicString' ) debugger.HandleCommand( 'type summary add --expand -F lldb_blink.WTFVector_SummaryProvider -x "WTF::Vector<.+>$"' @@ -77,7 +77,7 @@ provider.get_length(), provider.is_8bit(), provider.to_string()) -def WTFAtomicString_SummaryProvider(valobj, dict): +def BlinkAtomicString_SummaryProvider(valobj, dict): return WTFString_SummaryProvider( valobj.GetChildMemberWithName('string_'), dict)
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 384ee76f..a271f36e 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -2780,31 +2780,31 @@ crbug.com/424798906 external/wpt/pointerevents/pointerevent_element_haspointercapture.html?touch [ Failure ] # ====== New tests from wpt-importer added here ====== -[ Win11-arm64 ] external/wpt/fedcm/fedcm-storage-access-api-autogrant.tentative.https.sub.html [ Timeout ] -[ Mac13 ] external/wpt/fetch/metadata/generated/window-location.https.sub.html [ Skip Timeout ] -[ Win11-arm64 ] external/wpt/html/document-isolation-policy/credentialless-shared-worker.https.tentative.window.html?request_origin=cross_origin&worker_dip=credentialless&window_dip=credentialless [ Skip Timeout ] -[ Win11-arm64 ] external/wpt/html/document-isolation-policy/credentialless-shared-worker.https.tentative.window.html?request_origin=cross_origin&worker_dip=none&window_dip=credentialless [ Skip Timeout ] -[ Mac13 ] external/wpt/resource-timing/nested-context-navigations-embed.html [ Skip Timeout ] -[ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html [ Crash ] -[ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html [ Crash ] -[ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html [ Crash ] -[ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html [ Timeout ] -external/wpt/trusted-types/navigate-to-javascript-url-007-crash.html [ Crash ] -[ Mac14 ] external/wpt/trusted-types/trusted-types-navigation.html?06-10 [ Pass Timeout ] -[ Win11 ] external/wpt/trusted-types/trusted-types-navigation.html?31-35 [ Pass Timeout ] -[ Win11-arm64 ] external/wpt/trusted-types/trusted-types-navigation.html?31-35 [ Pass Timeout ] -external/wpt/webdriver/tests/bidi/emulation/set_locale_override/contexts.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_locale_override/invalid.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_locale_override/locale.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_locale_override/user_contexts.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/contexts.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/invalid.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/screen_orientation.py [ Failure ] -external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/user_contexts.py [ Failure ] -[ Android ] external/wpt/webdriver/tests/bidi/input/perform_actions/wheel.py [ Failure ] -[ Android ] external/wpt/webdriver/tests/bidi/integration/parallel_execution/browsing_context_set_viewport.py [ Failure ] -[ Android ] external/wpt/webdriver/tests/classic/perform_actions/wheel.py [ Failure ] -[ Win11-arm64 ] virtual/split-http-cache/external/wpt/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html [ Crash ] +crbug.com/428759817 [ Win11-arm64 ] external/wpt/fedcm/fedcm-storage-access-api-autogrant.tentative.https.sub.html [ Timeout ] +crbug.com/428754582 [ Mac13 ] external/wpt/fetch/metadata/generated/window-location.https.sub.html [ Skip Timeout ] +crbug.com/428769113 [ Win11-arm64 ] external/wpt/html/document-isolation-policy/credentialless-shared-worker.https.tentative.window.html?request_origin=cross_origin&worker_dip=credentialless&window_dip=credentialless [ Skip Timeout ] +crbug.com/428769113 [ Win11-arm64 ] external/wpt/html/document-isolation-policy/credentialless-shared-worker.https.tentative.window.html?request_origin=cross_origin&worker_dip=none&window_dip=credentialless [ Skip Timeout ] +crbug.com/428760782 [ Mac13 ] external/wpt/resource-timing/nested-context-navigations-embed.html [ Skip Timeout ] +crbug.com/428759817 [ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html [ Crash ] +crbug.com/428759817 [ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html [ Crash ] +crbug.com/428759817 [ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html [ Crash ] +crbug.com/428759817 [ Win11-arm64 ] external/wpt/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html [ Timeout ] +crbug.com/428754684 external/wpt/trusted-types/navigate-to-javascript-url-007-crash.html [ Crash ] +crbug.com/428754684 [ Mac14 ] external/wpt/trusted-types/trusted-types-navigation.html?06-10 [ Pass Timeout ] +crbug.com/428754684 [ Win11 ] external/wpt/trusted-types/trusted-types-navigation.html?31-35 [ Pass Timeout ] +crbug.com/428754684 [ Win11-arm64 ] external/wpt/trusted-types/trusted-types-navigation.html?31-35 [ Pass Timeout ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_locale_override/contexts.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_locale_override/invalid.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_locale_override/locale.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_locale_override/user_contexts.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/contexts.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/invalid.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/screen_orientation.py [ Failure ] +crbug.com/428744357 external/wpt/webdriver/tests/bidi/emulation/set_screen_orientation_override/user_contexts.py [ Failure ] +crbug.com/428744357 [ Android ] external/wpt/webdriver/tests/bidi/input/perform_actions/wheel.py [ Failure ] +crbug.com/428744357 [ Android ] external/wpt/webdriver/tests/bidi/integration/parallel_execution/browsing_context_set_viewport.py [ Failure ] +crbug.com/428744357 [ Android ] external/wpt/webdriver/tests/classic/perform_actions/wheel.py [ Failure ] +crbug.com/428759817 [ Win11-arm64 ] virtual/split-http-cache/external/wpt/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html [ Crash ] crbug.com/427497866 external/wpt/webdriver/tests/bidi/browsing_context/download_end/download_end.py [ Failure ] crbug.com/427497866 external/wpt/webdriver/tests/bidi/browsing_context/download_end/status.py [ Failure ] crbug.com/427499595 [ Mac14 ] virtual/close-watcher/external/wpt/close-watcher/iframes/dialog-same-origin-nn.html [ Skip Timeout ]
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json index 4a82bdcd..a366721 100644 --- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json +++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -280596,6 +280596,19 @@ {} ] ], + "filter-with-mix-blend-mode.html": [ + "bd3710eca89324c338a0b42df602c2226e57c0b5", + [ + null, + [ + [ + "/css/filter-effects/reference/filter-with-mix-blend-mode-ref.html", + "==" + ] + ], + {} + ] + ], "filtered-block-is-container.html": [ "6f99f364e638028098ae10319290e8bf2a9a9457", [ @@ -305633,6 +305646,19 @@ {} ] ], + "dialog-popover-overlay.html": [ + "7fa820e76ff0920562dafa09741ab1b418c15d18", + [ + null, + [ + [ + "/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html", + "==" + ] + ], + {} + ] + ], "dialogs-with-no-backdrop.html": [ "fec4ba85874e898bd5f4ffc698b5881513346217", [ @@ -306534,6 +306560,19 @@ {} ] ], + "popover-hidden-appearance.html": [ + "5cfa8a703540ea4e29c45899f07ac7f1307c3a1a", + [ + null, + [ + [ + "/compat/green-ref.html", + "==" + ] + ], + {} + ] + ], "popover-hidden-display.html": [ "db61802db60adf9d14ec1266e230222116f40b47", [ @@ -347143,7 +347182,7 @@ [] ], "font-style-valid-expected.txt": [ - "49f323734cc57b25a1c82443138492de358742d3", + "e7cb35d7e3a29673a478b5771b8dd64c6cd3b855", [] ], "font-synthesis-computed-expected.txt": [ @@ -382412,6 +382451,10 @@ "c1aeed8c441e6f72c6faa893d64ae30bdacbec06", [] ], + "filter-with-mix-blend-mode-ref.html": [ + "1059b396b393f6bb5482b1290c0323b1d74efb72", + [] + ], "filters-drop-shadow-001-ref.html": [ "3776a006095dd3ec5b9ea826e3260c91469711b6", [] @@ -409303,6 +409346,10 @@ "97141e6c517d62d9c598bed2303696da2cda91ee", [] ], + "dialog-popover-overlay-ref.html": [ + "46581691ffc2e9b69f4902ca9de57b373cc88fc3", + [] + ], "dialogs-with-no-backdrop-ref.html": [ "4b31dc7062e697496f4edfaf98a70c0e794c6245", [] @@ -421964,6 +422011,12 @@ "0cc01909796fcce22401ef0ed2ffda3582f56634", [] ], + "bugs": { + "events_after_lostpointercapture_remove_setcapture_node-expected.txt": [ + "965db67959caab5abc322ff45d0133f8203493ec", + [] + ] + }, "compat": { "pointerevent_mouse_target_after_pointer_target_root_element_in_shadow_removed-expected.txt": [ "76c4fa0b8284093090ec570b174f91b39ffae708", @@ -422014,10 +422067,6 @@ "356dfec5190c6b36a4d90ff5095a1dd6b88e0c89", [] ], - "pointerevent_lostpointercapture_remove_setcapture_node-expected.txt": [ - "2d3c1af839d52c9176d85201b92de9c970fffe15", - [] - ], "pointerevent_multiple_pointerover_no_pointer_movement-expected.txt": [ "60139a8e5e7ec5097e4fcc951368f2c32d594013", [] @@ -508159,6 +508208,13 @@ {} ] ], + "flexbox-ignores-first-letter.html": [ + "fca625e4645c6cdaf3460b9fd3deddca87411b3d", + [ + null, + {} + ] + ], "flexbox-justify-content-wmvert-002.html": [ "2aaee48596bbb0a17e0dd9e022d7a60e10670979", [ @@ -510253,7 +510309,7 @@ ] ], "font-style-valid.html": [ - "95c5af3c41649c0935259178d20bcbd90a537153", + "274ee2aca1bf6b74279f91f329934c931c1d0969", [ null, {} @@ -690739,6 +690795,17 @@ ] }, "pointerevents": { + "bugs": { + "events_after_lostpointercapture_remove_setcapture_node.html": [ + "ec478a68006fa4e806cf6896d85e5a089690fecd", + [ + null, + { + "testdriver": true + } + ] + ] + }, "capturing_boundary_event_handler_at_ua_shadowdom.html": [ "7500277f2251fa300f9af99d52e1f73a943f237c", [ @@ -691689,7 +691756,7 @@ ] ], "pointerevent_lostpointercapture_remove_setcapture_node.html": [ - "8da1b7d28c45e49f31ba55e05eac3fe6e5a01283", + "c20f62174bd402ecb5e0701f94725ee857c26de4", [ null, { @@ -760819,7 +760886,7 @@ ] ], "k-rate-audiobuffersource-connections.html": [ - "0b94bd70f9f7c5da26654845ec784d6805f4117e", + "5fa43d7e90372ea0a9b568f94f4882183420d4f2", [ null, {}
diff --git a/third_party/blink/web_tests/external/wpt/css/css-flexbox/flexbox-ignores-first-letter.html b/third_party/blink/web_tests/external/wpt/css/css-flexbox/flexbox-ignores-first-letter.html new file mode 100644 index 0000000..fca625e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-flexbox/flexbox-ignores-first-letter.html
@@ -0,0 +1,106 @@ +<!DOCTYPE html> +<link rel="help" href=""> +<link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-letter"> +<meta name="assert" content=""> +<style> + body { line-height: 20px; } + .flexbox { display: flex; } + .inline-flexbox { display: inline-flex; } + .flexbox-first-letter::first-letter { line-height: 100px; color: red; } + .container-first-letter::first-letter { line-height: 200px; color: green; } +</style> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/resources/check-layout-th.js"></script> + +<body onload="checkLayout('.container');"> + +<div id="log"></div> + +<div class="container"> + <div class="flexbox flexbox-first-letter"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> +</div> + +<div class="container"> + <div class="inline-flexbox flexbox-first-letter"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> +</div> + +<div class="container"> + <div class="flexbox flexbox-first-letter" data-expected-height=20> + Anonymous item. + </div> +</div> + +<div class="container"> + <div class="inline-flexbox flexbox-first-letter" data-expected-height=20> + Anonymous item. + </div> +</div> + +<div class="container container-first-letter"> + <div class="flexbox flexbox-first-letter"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="inline-flexbox flexbox-first-letter"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="flexbox flexbox-first-letter" data-expected-height=20> + Anonymous item. + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="inline-flexbox flexbox-first-letter" data-expected-height=20> + Anonymous item. + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="flexbox"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="inline-flexbox"> + <div class="item" data-expected-height=20>The first item.</div> + <div class="item" data-expected-height=20>The second item.</div> + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="flexbox" data-expected-height=20> + Anonymous item. + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> + +<div class="container container-first-letter"> + <div class="inline-flexbox" data-expected-height=20> + Anonymous item. + </div> + <div data-expected-height=20>Out of flexbox.</div> +</div> +</body> +
diff --git a/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid-expected.txt index 49f3237..e7cb35d 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid-expected.txt +++ b/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid-expected.txt
@@ -1,8 +1,6 @@ This is a testharness.js-based test. [FAIL] e.style['font-style'] = "oblique 0deg" should set the property value assert_equals: serialization should be canonical expected "normal" but got "oblique 0deg" -[FAIL] e.style['font-style'] = "oblique 14deg" should set the property value - assert_equals: serialization should be canonical expected "oblique" but got "oblique 14deg" [FAIL] e.style['font-style'] = "oblique calc(100deg)" should set the property value assert_equals: serialization should be canonical expected "oblique calc(100deg)" but got "oblique 90deg" [FAIL] e.style['font-style'] = "oblique calc(-100deg)" should set the property value
diff --git a/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid.html b/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid.html index 95c5af3c..274ee2a 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid.html +++ b/third_party/blink/web_tests/external/wpt/css/css-fonts/parsing/font-style-valid.html
@@ -20,7 +20,7 @@ test_valid_value('font-style', 'oblique 10deg'); test_valid_value('font-style', 'oblique -10deg'); -test_valid_value('font-style', 'oblique 14deg', 'oblique'); +test_valid_value('font-style', 'oblique 14deg'); test_valid_value('font-style', 'oblique -14deg'); test_valid_value('font-style', 'oblique -90deg'); test_valid_value('font-style', 'oblique 90deg');
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/percentage-without-context.html b/third_party/blink/web_tests/external/wpt/css/css-values/percentage-without-context.html index 8bda69da..8f905c8 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-values/percentage-without-context.html +++ b/third_party/blink/web_tests/external/wpt/css/css-values/percentage-without-context.html
@@ -14,4 +14,8 @@ test_invalid_value("offset-path", "ray(calc(sign(50%) * 1deg))"); test_invalid_value("color", "hsl(calc(sign(50%) * 1deg) 82% 43%)"); test_invalid_value("transform", "rotate(calc(sign(50%) * 1deg))"); +test_invalid_value("animation-duration", "calc(sign(50%) * 1s)"); +test_invalid_value("animation-delay", "calc(sign(50%) * 1s)"); +test_invalid_value("transition-duration", "calc(sign(50%) * 1s)"); +test_invalid_value("transition-delay", "calc(sign(50%) * 1s)"); </script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/resolution-with-percentage-without-context.html b/third_party/blink/web_tests/external/wpt/css/css-values/resolution-with-percentage-without-context.html new file mode 100644 index 0000000..f33ac20 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-values/resolution-with-percentage-without-context.html
@@ -0,0 +1,25 @@ +<!DOCTYPE html> +<title>CSS Values Test: percentage without context is not allowed in resolution type</title> +<link rel="help" href="https://drafts.csswg.org/css-values-4/#calc-context"> +<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html"> +<style> +div { + background-color: green; + width: 100px; + height: 100px; +} + +@media (resolution <= calc(sign(50%) * 1dpi)) { + div { + background-color: red; + } +} + +@media (resolution >= calc(sign(50%) * 1dpi)) { + div { + background-color: red; + } +} +</style> +<p>Test passes if there is a filled green square.</p> +<div></div>
diff --git a/third_party/blink/web_tests/external/wpt/css/filter-effects/filter-with-mix-blend-mode.html b/third_party/blink/web_tests/external/wpt/css/filter-effects/filter-with-mix-blend-mode.html new file mode 100644 index 0000000..bd3710e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/filter-effects/filter-with-mix-blend-mode.html
@@ -0,0 +1,23 @@ +<!DOCTYPE html> +<html> +<head> +<title>CSS Filters: filter and mix-blend mode on the same element</title> +<link rel="help" href="https://drafts.fxtf.org/filter-effects-1"> +<link rel="match" href="reference/filter-with-mix-blend-mode-ref.html"> +<style> + html { + background: green; + } + div { + width: 200px; + height: 200px; + background: red; + filter: grayscale(); + mix-blend-mode: screen; + } +</style> +</head> +<body> + <div></div> +</body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/filter-effects/reference/filter-with-mix-blend-mode-ref.html b/third_party/blink/web_tests/external/wpt/css/filter-effects/reference/filter-with-mix-blend-mode-ref.html new file mode 100644 index 0000000..1059b396 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/filter-effects/reference/filter-with-mix-blend-mode-ref.html
@@ -0,0 +1,27 @@ +<!DOCTYPE html> +<html> +<head> +<title>CSS Filters: filter and mix-blend mode on the same element (ref)</title> +<style> + html { + background: green; + } + div { + width: 200px; + height: 200px; + } + .outer { + mix-blend-mode: screen; + } + .inner { + background: red; + filter: grayscale(); + } +</style> +</head> +<body> + <div class=outer> + <div class=inner></div> + </div> +</body> +</html>
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/stream/tentative/write.any_default-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/stream/tentative/write.any_default-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/websockets/stream/tentative/write.any_default-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt b/third_party/blink/web_tests/platform/mac-mac12/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt deleted file mode 100644 index 5e21ea7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac12/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -[FAIL] Worker construction for a file URL should fail - Failed to construct 'Worker': Script at 'file:///static-import-worker.js' cannot be accessed from origin 'http://web-platform.test:8001'. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt deleted file mode 100644 index 1adb7a81..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/FileAPI/url/url-with-xhr.any.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x0000000102b5ded2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x0000000102b52ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010256fd5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010256b25f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010255db61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010255f59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010255de7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010255d882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010255d72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x000000010255baea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x000000010255bea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x00000001025731c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x00000001025fdb05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x00000001025ddad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x00000001025fd9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x00000001025fd2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x00000001025dd8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x00000001025ae1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x00000001025ad1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x00000001025adf4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000102af5d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x0000000102b1dbb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x0000000102b1d63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x0000000102b1e025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000102af8073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x0000000102b1e37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x0000000102ae61aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x0000000102b40218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x0000000102b403b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x0000000102b529d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt deleted file mode 100644 index b33791b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/css-cascade/important-vs-inline-001-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x000000010a6eced2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x000000010a6e1ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010a0fed5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010a0fa25f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010a0ecb61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010a0ee59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010a0ece7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010a0ec882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010a0ec72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x000000010a0eaaea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x000000010a0eaea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x000000010a1021c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010a18cb05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010a16cad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010a18c9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010a18c2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010a16c8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010a13d1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010a13c1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010a13cf4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x000000010a684d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x000000010a6acbb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010a6ac63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x000000010a6ad025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x000000010a687073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010a6ad37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x000000010a6751aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x000000010a6cf218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x000000010a6cf3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x000000010a6e19d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt deleted file mode 100644 index bd0c8219..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x000000010d265ed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x000000010d25aebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010cc77d5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010cc7325f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010cc65b61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010cc6759b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010cc65e7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010cc65882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010cc6572a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x000000010cc63aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x000000010cc63ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x000000010cc7b1c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010cd05b05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010cce5ad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010cd059dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010cd052c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010cce58a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010ccb61a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010ccb51b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010ccb5f4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x000000010d1fdd37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x000000010d225bb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010d22563b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x000000010d226025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x000000010d200073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010d22637d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x000000010d1ee1aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x000000010d248218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x000000010d2483b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x000000010d25a9d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt deleted file mode 100644 index 4f668f5..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x00000001017eced2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x00000001017e1ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x00000001011fed5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x00000001011fa25f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x00000001011ecb61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x00000001011ee59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x00000001011ece7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x00000001011ec882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x00000001011ec72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x00000001011eaaea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x00000001011eaea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x00000001012021c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010128cb05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010126cad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010128c9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010128c2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010126c8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010123d1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010123c1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010123cf4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000101784d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x00000001017acbb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x00000001017ac63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x00000001017ad025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000101787073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x00000001017ad37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x00000001017751aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x00000001017cf218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x00000001017cf3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x00000001017e19d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt deleted file mode 100644 index 0315f7d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = Uncaught NetworkError: Failed to execute 'importScripts' on 'WorkerGlobalScope': The script at 'http://web-platform.test:8001/html/canvas/resources/canvas-tests.js' failed to load. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt deleted file mode 100644 index d6a2169..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x0000000107b8aed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x0000000107b7febe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010759cd5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010759825f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010758ab61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010758c59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010758ae7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010758a882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010758a72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x0000000107588aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x0000000107588ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x00000001075a01c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010762ab05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010760aad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010762a9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010762a2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010760a8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x00000001075db1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x00000001075da1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x00000001075daf4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000107b22d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x0000000107b4abb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x0000000107b4a63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x0000000107b4b025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000107b25073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x0000000107b4b37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x0000000107b131aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x0000000107b6d218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x0000000107b6d3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x0000000107b7f9d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt deleted file mode 100644 index ec6c133..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x00000001081b2ed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x00000001081a7ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x0000000107bc4d5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x0000000107bc025f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x0000000107bb2b61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x0000000107bb459b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x0000000107bb2e7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x0000000107bb2882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x0000000107bb272a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x0000000107bb0aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x0000000107bb0ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x0000000107bc81c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x0000000107c52b05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x0000000107c32ad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x0000000107c529dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x0000000107c522c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x0000000107c328a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x0000000107c031a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x0000000107c021b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x0000000107c02f4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x000000010814ad37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x0000000108172bb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010817263b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x0000000108173025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x000000010814d073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010817337d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x000000010813b1aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x0000000108195218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x00000001081953b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x00000001081a79d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt deleted file mode 100644 index cbe6a3f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x00000001060fded2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x00000001060f2ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x0000000105b0fd5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x0000000105b0b25f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x0000000105afdb61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x0000000105aff59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x0000000105afde7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x0000000105afd882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x0000000105afd72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x0000000105afbaea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x0000000105afbea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x0000000105b131c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x0000000105b9db05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x0000000105b7dad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x0000000105b9d9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x0000000105b9d2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x0000000105b7d8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x0000000105b4e1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x0000000105b4d1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x0000000105b4df4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000106095d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x00000001060bdbb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x00000001060bd63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x00000001060be025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000106098073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x00000001060be37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x00000001060861aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x00000001060e0218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x00000001060e03b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x00000001060f29d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt deleted file mode 100644 index 31ed754a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/navigation-api/navigation-methods/return-value/back-intercept-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x0000000106efaed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x0000000106eefebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010690cd5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010690825f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x00000001068fab61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x00000001068fc59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x00000001068fae7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x00000001068fa882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x00000001068fa72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x00000001068f8aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x00000001068f8ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x00000001069101c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010699ab05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010697aad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010699a9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010699a2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010697a8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010694b1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010694a1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010694af4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000106e92d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x0000000106ebabb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x0000000106eba63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x0000000106ebb025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000106e95073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x0000000106ebb37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x0000000106e831aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x0000000106edd218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x0000000106edd3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x0000000106eef9d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt deleted file mode 100644 index e0577dc..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/interfaces/WebSocket/close/close-connecting_wss-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x000000010db17ed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x000000010db0cebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010d529d5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010d52525f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010d517b61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010d51959b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010d517e7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010d517882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010d51772a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x000000010d515aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x000000010d515ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x000000010d52d1c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010d5b7b05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010d597ad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010d5b79dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010d5b72c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010d5978a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010d5681a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010d5671b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010d567f4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x000000010daafd37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x000000010dad7bb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010dad763b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x000000010dad8025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x000000010dab2073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010dad837d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x000000010daa01aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x000000010dafa218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x000000010dafa3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x000000010db0c9d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/stream/tentative/write.any_default-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/stream/tentative/write.any_default-expected.txt deleted file mode 100644 index f3040f6..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/websockets/stream/tentative/write.any_default-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x00000001065aeed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x00000001065a3ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x0000000105fc0d5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x0000000105fbc25f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x0000000105faeb61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x0000000105fb059b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x0000000105faee7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x0000000105fae882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x0000000105fae72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x0000000105facaea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x0000000105facea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x0000000105fc41c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010604eb05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010602ead2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010604e9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010604e2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010602e8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x0000000105fff1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x0000000105ffe1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x0000000105ffef4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x0000000106546d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x000000010656ebb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010656e63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x000000010656f025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x0000000106549073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010656f37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x00000001065371aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x0000000106591218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x00000001065913b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x00000001065a39d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt b/third_party/blink/web_tests/platform/mac-mac13/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt deleted file mode 100644 index e76a411..0000000 --- a/third_party/blink/web_tests/platform/mac-mac13/external/wpt/workers/modules/dedicated-worker-import-failure-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -Harness Error. harness_status.status = 1 , harness_status.message = unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\nTraceback (most recent call last):\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 964, in run_func\n self.result = True, self.func(self.protocol, self.url, self.timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1167, in do_testharness\n raw_results = self.run_testdriver(protocol, url, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py", line 1052, in run_testdriver\n protocol.webdriver.url = url\n ^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 566, in url\n return self.send_session_command("POST", "url", body)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 555, in send_session_command\n return self.send_command(method, url, body, timeout)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File "/Volumes/Work/s/w/ir/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py", line 516, in send_command\n raise err\nwebdriver.error.UnknownErrorException: unknown error (500): unknown error: net::ERR_CONNECTION_REFUSED\n (Session info: chrome-headless-shell=140.0.7271.0)\n\nRemote-end stacktrace:\n\n0 chromedriver 0x000000010edfbed2 base::debug::CollectStackTrace(base::span<void const*, 18446744073709551615ul, void const**>) + 18\n1 chromedriver 0x000000010edf0ebe base::debug::StackTrace::StackTrace() + 62\n2 chromedriver 0x000000010e80dd5a Status::Status(StatusCode, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&) + 234\n3 chromedriver 0x000000010e80925f NavigationTracker::OnCommandSuccess(DevToolsClient*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const*, Timeout const&) + 303\n4 chromedriver 0x000000010e7fbb61 DevToolsClientImpl::EnsureListenersNotifiedOfCommandResponse() + 145\n5 chromedriver 0x000000010e7fd59b DevToolsClientImpl::ProcessCommandResponse(InspectorCommandResponse) + 1755\n6 chromedriver 0x000000010e7fbe7e DevToolsClientImpl::HandleMessage(int, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, DevToolsClient*) + 734\n7 chromedriver 0x000000010e7fb882 DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1618\n8 chromedriver 0x000000010e7fb72a DevToolsClientImpl::ProcessNextMessage(int, bool, Timeout const&, DevToolsClient*) + 1274\n9 chromedriver 0x000000010e7f9aea DevToolsClientImpl::SendCommandInternal(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue*, bool, bool, int, Timeout const*) + 3754\n10 chromedriver 0x000000010e7f9ea7 DevToolsClientImpl::SendCommandWithTimeout(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::DictValue const&, Timeout const*) + 103\n11 chromedriver 0x000000010e8111c9 WebViewImpl::Load(std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, Timeout const*) + 425\n12 chromedriver 0x000000010e89bb05 ExecuteGet(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 133\n13 chromedriver 0x000000010e87bad2 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, base::internal::BindState<false, true, false, Status (*)(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>, Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(base::internal::BindStateBase*, Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) + 34\n14 chromedriver 0x000000010e89b9dd base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)>::Run(Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*) const & + 125\n15 chromedriver 0x000000010e89b2c3 ExecuteWindowCommand(base::RepeatingCallback<Status (Session*, WebView*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*, Timeout*)> const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 2611\n16 chromedriver 0x000000010e87b8a3 base::internal::Invoker<base::internal::FunctorTraits<Status (* const&)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams const&>, base::internal::BindState<false, true, false, Status (*)(InitSessionParams const&, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*), InitSessionParams>, Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(base::internal::BindStateBase*, Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) + 19\n17 chromedriver 0x000000010e84c1a0 base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>::Run(Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*) const & + 96\n18 chromedriver 0x000000010e84b1b9 (anonymous namespace)::ExecuteSessionCommandOnSessionThread(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&) + 1081\n19 chromedriver 0x000000010e84bf4a base::internal::Invoker<base::internal::FunctorTraits<void (*&&)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), char const*&&, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>&&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>&&, bool&&, bool&&, base::DictValue&&, scoped_refptr<base::SingleThreadTaskRunner>&&, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>&&>, base::internal::BindState<false, true, false, void (*)(char const*, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)> const&, bool, bool, base::DictValue const&, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)> const&), base::internal::UnretainedWrapper<char const, base::unretained_traits::MayNotDangle, (partition_alloc::internal::RawPtrTraits)0>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>>, base::RepeatingCallback<Status (Session*, base::DictValue const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>*)>, bool, bool, base::DictValue, scoped_refptr<base::SingleThreadTaskRunner>, base::RepeatingCallback<void (Status const&, std::__Cr::unique_ptr<base::Value, std::__Cr::default_delete<base::Value>>, std::__Cr::basic_string<char, std::__Cr::char_traits<char>, std::__Cr::allocator<char>> const&, bool)>>, void ()>::RunOnce(base::internal::BindStateBase*) + 74\n20 chromedriver 0x000000010ed93d37 base::TaskAnnotator::RunTaskImpl(base::PendingTask&) + 311\n21 chromedriver 0x000000010edbbbb2 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::LazyNow*) + 1090\n22 chromedriver 0x000000010edbb63b base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 123\n23 chromedriver 0x000000010edbc025 non-virtual thunk to base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork() + 21\n24 chromedriver 0x000000010ed96073 base::MessagePumpDefault::Run(base::MessagePump::Delegate*) + 163\n25 chromedriver 0x000000010edbc37d base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run(bool, base::TimeDelta) + 333\n26 chromedriver 0x000000010ed841aa base::RunLoop::Run(base::Location const&) + 426\n27 chromedriver 0x000000010edde218 base::Thread::Run(base::RunLoop*) + 56\n28 chromedriver 0x000000010edde3b3 base::Thread::ThreadMain() + 387\n29 chromedriver 0x000000010edf09d7 base::(anonymous namespace)::ThreadFunc(void*) + 167\n30 libsystem_pthread.dylib 0x00007ff80bd2e1d3 _pthread_start + 125\n31 libsystem_pthread.dylib 0x00007ff80bd29bd3 thread_start + 15\n -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/mac/virtual/html-anchor-attribute-disabled/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/html-anchor-attribute-disabled/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/html-anchor-attribute-disabled/external/wpt/html/semantics/popovers/popover-invoking-attribute-hint-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/mac/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt deleted file mode 100644 index 5b37deb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/scrollIntoView-container-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -All subtests passed and are omitted for brevity. -See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details. -Harness: the test ran to completion.
diff --git a/third_party/boringssl/src b/third_party/boringssl/src index be5be0a..db421c2 160000 --- a/third_party/boringssl/src +++ b/third_party/boringssl/src
@@ -1 +1 @@ -Subproject commit be5be0a4f5ebf00da151a06860deb11a0ffb609f +Subproject commit db421c2d800f6d2e164366af6a28bc52b2dafbf7
diff --git a/third_party/omnibox_proto/BUILD.gn b/third_party/omnibox_proto/BUILD.gn index 1f700dee..2d09ba9 100644 --- a/third_party/omnibox_proto/BUILD.gn +++ b/third_party/omnibox_proto/BUILD.gn
@@ -15,6 +15,7 @@ "entity_info.proto", "groups.proto", "navigational_intent.proto", + "ntp_composebox_config.proto", "rich_answer_template.proto", "rich_suggest_template.proto", "search_context.proto",
diff --git a/third_party/omnibox_proto/README.chromium b/third_party/omnibox_proto/README.chromium index f2f188d..06f13726 100644 --- a/third_party/omnibox_proto/README.chromium +++ b/third_party/omnibox_proto/README.chromium
@@ -1,8 +1,8 @@ Name: Omnibox Protos Short Name: omnibox_proto URL: This is the canonical public repository -Version: 769320858 -Date: 2025-06-09 +Version: 777767990 +Date: 2025-06-30 License: BSD-3-Clause License File: LICENSE Shipped: yes
diff --git a/third_party/omnibox_proto/ntp_composebox_config.proto b/third_party/omnibox_proto/ntp_composebox_config.proto new file mode 100644 index 0000000..39d31f12 --- /dev/null +++ b/third_party/omnibox_proto/ntp_composebox_config.proto
@@ -0,0 +1,21 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = 'proto2'; + +option optimize_for = LITE_RUNTIME; +option java_package = 'org.chromium.components.omnibox'; +option java_outer_classname = 'NtpComposeboxConfigProto'; + +package omnibox; + +// Configuration for customizing the NTP Composebox. +// Next ID: 2 +message NTPComposeboxConfig { + // Next ID: 2 + message EntryPoint { + optional int32 num_page_load_animations = 1; + } + optional EntryPoint entry_point = 1; +}
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn index 76884e54..c549ee3 100644 --- a/third_party/protobuf/BUILD.gn +++ b/third_party/protobuf/BUILD.gn
@@ -146,6 +146,10 @@ # The proto_extras plugin generates code that some of the above fuzzers # use, and thus needs to know the full types. "//components/proto_extras:protobuf_full_support", + + # Sync requires descriptors for testing. + "//components/sync:full_proto_unittests", + "//components/sync/protocol:full_proto", ] }
diff --git a/third_party/rust/chromium_crates_io/Cargo.lock b/third_party/rust/chromium_crates_io/Cargo.lock index c49ccb78..8b75c1f 100644 --- a/third_party/rust/chromium_crates_io/Cargo.lock +++ b/third_party/rust/chromium_crates_io/Cargo.lock
@@ -610,7 +610,7 @@ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "equivalent",
diff --git a/third_party/rust/chromium_crates_io/supply-chain/config.toml b/third_party/rust/chromium_crates_io/supply-chain/config.toml index 6864a0e5..0db97a11 100644 --- a/third_party/rust/chromium_crates_io/supply-chain/config.toml +++ b/third_party/rust/chromium_crates_io/supply-chain/config.toml
@@ -230,7 +230,7 @@ [policy."icu_provider:2.0.0"] criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"] -[policy."indexmap:2.9.0"] +[policy."indexmap:2.10.0"] criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"] [policy."itertools:0.11.0"]
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/.cargo_vcs_info.json b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/.cargo_vcs_info.json index a466a69..7188d42 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/.cargo_vcs_info.json +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/.cargo_vcs_info.json
@@ -1,6 +1,6 @@ { "git": { - "sha1": "1818d4140d86aeef18c515f1b060a3fa68da2708" + "sha1": "91dbcc55d2b6be52b7f99929aebb7204a6576189" }, "path_in_vcs": "" } \ No newline at end of file
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.lock b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.lock index a793b21..cb7d0da 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.lock +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.lock
@@ -9,12 +9,6 @@ checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" [[package]] -name = "bitflags" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" - -[[package]] name = "borsh" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -25,9 +19,9 @@ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "cfg_aliases" @@ -73,6 +67,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -80,46 +80,33 @@ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasi", ] [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" dependencies = [ "arbitrary", "borsh", "equivalent", + "fastrand", "fnv", "hashbrown", "itertools", - "lazy_static", "quickcheck", - "rand 0.9.0", "rayon", "serde", "serde_derive", @@ -135,31 +122,16 @@ ] [[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] name = "libc" -version = "0.2.171" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -170,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -183,39 +155,12 @@ ] [[package]] -name = "r-efi" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" - -[[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rand" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" -dependencies = [ - "rand_chacha", - "rand_core 0.9.3", - "zerocopy", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.3", + "rand_core", ] [[package]] @@ -224,16 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom 0.3.2", + "getrandom", ] [[package]] @@ -278,9 +214,9 @@ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -295,44 +231,6 @@ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] - -[[package]] -name = "zerocopy" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml index 8556036..959c0ee 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.63" name = "indexmap" -version = "2.9.0" +version = "2.10.0" build = false autolib = false autobins = false @@ -118,23 +118,20 @@ optional = true default-features = false +[dev-dependencies.fastrand] +version = "2" +default-features = false + [dev-dependencies.fnv] version = "1.0" [dev-dependencies.itertools] version = "0.14" -[dev-dependencies.lazy_static] -version = "1.3" - [dev-dependencies.quickcheck] version = "1.0" default-features = false -[dev-dependencies.rand] -version = "0.9" -features = ["small_rng"] - [dev-dependencies.serde_derive] version = "1.0"
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml.orig b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml.orig index 274cdbe..f7fa6c5 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml.orig +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/Cargo.toml.orig
@@ -1,7 +1,7 @@ [package] name = "indexmap" edition = "2021" -version = "2.9.0" +version = "2.10.0" documentation = "https://docs.rs/indexmap/" repository = "https://github.com/indexmap-rs/indexmap" license = "Apache-2.0 OR MIT" @@ -30,10 +30,9 @@ [dev-dependencies] itertools = "0.14" -rand = {version = "0.9", features = ["small_rng"] } +fastrand = { version = "2", default-features = false } quickcheck = { version = "1.0", default-features = false } fnv = "1.0" -lazy_static = "1.3" serde_derive = "1.0" [features]
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/RELEASES.md b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/RELEASES.md index 56ad6e0..99a46f96 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/RELEASES.md +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/RELEASES.md
@@ -1,5 +1,11 @@ # Releases +## 2.10.0 (2025-06-26) + +- Added `extract_if` methods to `IndexMap` and `IndexSet`, similar to the + methods for `HashMap` and `HashSet` with ranges like `Vec::extract_if`. +- Added more `#[track_caller]` annotations to functions that may panic. + ## 2.9.0 (2025-04-04) - Added a `get_disjoint_mut` method to `IndexMap`, matching Rust 1.86's @@ -7,7 +13,7 @@ - Added a `get_disjoint_indices_mut` method to `IndexMap` and `map::Slice`, matching Rust 1.86's `get_disjoint_mut` method on slices. - Deprecated the `borsh` feature in favor of their own `indexmap` feature, - solving a cyclic dependency that occured via `borsh-derive`. + solving a cyclic dependency that occurred via `borsh-derive`. ## 2.8.0 (2025-03-10)
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/bench.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/bench.rs index a4e8e21b..a011d54 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/bench.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/bench.rs
@@ -1,12 +1,11 @@ #![feature(test)] extern crate test; -#[macro_use] -extern crate lazy_static; use fnv::FnvHasher; use std::hash::BuildHasherDefault; use std::hash::Hash; +use std::sync::LazyLock; type FnvBuilder = BuildHasherDefault<FnvHasher>; use test::black_box; @@ -16,14 +15,10 @@ use std::collections::HashMap; -use rand::rngs::SmallRng; -use rand::seq::SliceRandom; -use rand::SeedableRng; - /// Use a consistently seeded Rng for benchmark stability -fn small_rng() -> SmallRng { +fn small_rng() -> fastrand::Rng { let seed = u64::from_le_bytes(*b"indexmap"); - SmallRng::seed_from_u64(seed) + fastrand::Rng::with_seed(seed) } #[bench] @@ -280,7 +275,7 @@ { let mut v = Vec::from_iter(iter); let mut rng = small_rng(); - v.shuffle(&mut rng); + rng.shuffle(&mut v); v } @@ -357,53 +352,45 @@ const LOOKUP_SAMPLE_SIZE: u32 = 5000; const SORT_MAP_SIZE: usize = 10_000; -// use lazy_static so that comparison benchmarks use the exact same inputs -lazy_static! { - static ref KEYS: Vec<u32> = shuffled_keys(0..LOOKUP_MAP_SIZE); -} +// use (lazy) statics so that comparison benchmarks use the exact same inputs -lazy_static! { - static ref HMAP_100K: HashMap<u32, u32> = { - let c = LOOKUP_MAP_SIZE; - let mut map = HashMap::with_capacity(c as usize); - let keys = &*KEYS; - for &key in keys { - map.insert(key, key); - } - map - }; -} +static KEYS: LazyLock<Vec<u32>> = LazyLock::new(|| shuffled_keys(0..LOOKUP_MAP_SIZE)); -lazy_static! { - static ref IMAP_100K: IndexMap<u32, u32> = { - let c = LOOKUP_MAP_SIZE; - let mut map = IndexMap::with_capacity(c as usize); - let keys = &*KEYS; - for &key in keys { - map.insert(key, key); - } - map - }; -} +static HMAP_100K: LazyLock<HashMap<u32, u32>> = LazyLock::new(|| { + let c = LOOKUP_MAP_SIZE; + let mut map = HashMap::with_capacity(c as usize); + let keys = &*KEYS; + for &key in keys { + map.insert(key, key); + } + map +}); -lazy_static! { - static ref IMAP_SORT_U32: IndexMap<u32, u32> = { - let mut map = IndexMap::with_capacity(SORT_MAP_SIZE); - for &key in &KEYS[..SORT_MAP_SIZE] { - map.insert(key, key); - } - map - }; -} -lazy_static! { - static ref IMAP_SORT_S: IndexMap<String, String> = { - let mut map = IndexMap::with_capacity(SORT_MAP_SIZE); - for &key in &KEYS[..SORT_MAP_SIZE] { - map.insert(format!("{:^16x}", &key), String::new()); - } - map - }; -} +static IMAP_100K: LazyLock<IndexMap<u32, u32>> = LazyLock::new(|| { + let c = LOOKUP_MAP_SIZE; + let mut map = IndexMap::with_capacity(c as usize); + let keys = &*KEYS; + for &key in keys { + map.insert(key, key); + } + map +}); + +static IMAP_SORT_U32: LazyLock<IndexMap<u32, u32>> = LazyLock::new(|| { + let mut map = IndexMap::with_capacity(SORT_MAP_SIZE); + for &key in &KEYS[..SORT_MAP_SIZE] { + map.insert(key, key); + } + map +}); + +static IMAP_SORT_S: LazyLock<IndexMap<String, String>> = LazyLock::new(|| { + let mut map = IndexMap::with_capacity(SORT_MAP_SIZE); + for &key in &KEYS[..SORT_MAP_SIZE] { + map.insert(format!("{:^16x}", &key), String::new()); + } + map +}); #[bench] fn lookup_hashmap_100_000_multi(b: &mut Bencher) { @@ -523,7 +510,7 @@ b.iter(|| { let mut merged = first_map.clone(); v.extend(second_map.iter().map(|(&k, &v)| (k, v))); - v.shuffle(&mut rng); + rng.shuffle(&mut v); merged.extend(v.drain(..)); merged @@ -550,7 +537,7 @@ b.iter(|| { let mut merged = first_map.clone(); v.extend(second_map.iter().map(|(&k, &v)| (k, v))); - v.shuffle(&mut rng); + rng.shuffle(&mut v); merged.extend(v.drain(..)); merged @@ -562,7 +549,7 @@ let map = IMAP_100K.clone(); let mut keys = Vec::from_iter(map.keys().copied()); let mut rng = small_rng(); - keys.shuffle(&mut rng); + rng.shuffle(&mut keys); b.iter(|| { let mut map = map.clone(); @@ -579,7 +566,7 @@ let map = IMAP_100K.clone(); let mut keys = Vec::from_iter(map.keys().copied()); let mut rng = small_rng(); - keys.shuffle(&mut rng); + rng.shuffle(&mut keys); keys.truncate(50); b.iter(|| { @@ -600,7 +587,7 @@ map.insert(key, key); } let mut rng = small_rng(); - keys.shuffle(&mut rng); + rng.shuffle(&mut keys); b.iter(|| { let mut map = map.clone();
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/faststring.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/faststring.rs index ecc28b4..670a51c 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/faststring.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/benches/faststring.rs
@@ -8,19 +8,15 @@ use std::collections::HashMap; -use rand::rngs::SmallRng; -use rand::seq::SliceRandom; -use rand::SeedableRng; - use std::hash::{Hash, Hasher}; use std::borrow::Borrow; use std::ops::Deref; /// Use a consistently seeded Rng for benchmark stability -fn small_rng() -> SmallRng { +fn small_rng() -> fastrand::Rng { let seed = u64::from_le_bytes(*b"indexmap"); - SmallRng::seed_from_u64(seed) + fastrand::Rng::with_seed(seed) } #[derive(PartialEq, Eq, Copy, Clone)] @@ -68,7 +64,7 @@ { let mut v = Vec::from_iter(iter); let mut rng = small_rng(); - v.shuffle(&mut rng); + rng.shuffle(&mut v); v }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/lib.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/lib.rs index 0458239..04995a2 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/lib.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/lib.rs
@@ -108,8 +108,6 @@ #[macro_use] extern crate std; -use alloc::vec::{self, Vec}; - mod arbitrary; #[macro_use] mod macros; @@ -203,16 +201,6 @@ } } -trait Entries { - type Entry; - fn into_entries(self) -> Vec<Self::Entry>; - fn as_entries(&self) -> &[Self::Entry]; - fn as_entries_mut(&mut self) -> &mut [Self::Entry]; - fn with_entries<F>(&mut self, f: F) - where - F: FnOnce(&mut [Self::Entry]); -} - /// The error type for [`try_reserve`][IndexMap::try_reserve] methods. #[derive(Clone, PartialEq, Eq, Debug)] pub struct TryReserveError {
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map.rs index 79a45527..872d454 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map.rs
@@ -16,7 +16,8 @@ pub use self::core::raw_entry_v1::{self, RawEntryApiV1}; pub use self::core::{Entry, IndexedEntry, OccupiedEntry, VacantEntry}; pub use self::iter::{ - Drain, IntoIter, IntoKeys, IntoValues, Iter, IterMut, IterMut2, Keys, Splice, Values, ValuesMut, + Drain, ExtractIf, IntoIter, IntoKeys, IntoValues, Iter, IterMut, IterMut2, Keys, Splice, + Values, ValuesMut, }; pub use self::mutable::MutableEntryKey; pub use self::mutable::MutableKeys; @@ -36,9 +37,9 @@ #[cfg(feature = "std")] use std::collections::hash_map::RandomState; -use self::core::IndexMapCore; +pub(crate) use self::core::{ExtractCore, IndexMapCore}; use crate::util::{third, try_simplify_range}; -use crate::{Bucket, Entries, Equivalent, GetDisjointMutError, HashValue, TryReserveError}; +use crate::{Bucket, Equivalent, GetDisjointMutError, HashValue, TryReserveError}; /// A hash table where the iteration order of the key-value pairs is independent /// of the hash values of the keys. @@ -113,32 +114,6 @@ } } -impl<K, V, S> Entries for IndexMap<K, V, S> { - type Entry = Bucket<K, V>; - - #[inline] - fn into_entries(self) -> Vec<Self::Entry> { - self.core.into_entries() - } - - #[inline] - fn as_entries(&self) -> &[Self::Entry] { - self.core.as_entries() - } - - #[inline] - fn as_entries_mut(&mut self) -> &mut [Self::Entry] { - self.core.as_entries_mut() - } - - fn with_entries<F>(&mut self, f: F) - where - F: FnOnce(&mut [Self::Entry]), - { - self.core.with_entries(f); - } -} - impl<K, V, S> fmt::Debug for IndexMap<K, V, S> where K: fmt::Debug, @@ -205,6 +180,28 @@ } } + #[inline] + pub(crate) fn into_entries(self) -> Vec<Bucket<K, V>> { + self.core.into_entries() + } + + #[inline] + pub(crate) fn as_entries(&self) -> &[Bucket<K, V>] { + self.core.as_entries() + } + + #[inline] + pub(crate) fn as_entries_mut(&mut self) -> &mut [Bucket<K, V>] { + self.core.as_entries_mut() + } + + pub(crate) fn with_entries<F>(&mut self, f: F) + where + F: FnOnce(&mut [Bucket<K, V>]), + { + self.core.with_entries(f); + } + /// Return the number of elements the map can hold without reallocating. /// /// This number is a lower bound; the map might be able to hold more, @@ -307,6 +304,55 @@ Drain::new(self.core.drain(range)) } + /// Creates an iterator which uses a closure to determine if an element should be removed, + /// for all elements in the given range. + /// + /// If the closure returns true, the element is removed from the map and yielded. + /// If the closure returns false, or panics, the element remains in the map and will not be + /// yielded. + /// + /// Note that `extract_if` lets you mutate every value in the filter closure, regardless of + /// whether you choose to keep or remove it. + /// + /// The range may be any type that implements [`RangeBounds<usize>`], + /// including all of the `std::ops::Range*` types, or even a tuple pair of + /// `Bound` start and end values. To check the entire map, use `RangeFull` + /// like `map.extract_if(.., predicate)`. + /// + /// If the returned `ExtractIf` is not exhausted, e.g. because it is dropped without iterating + /// or the iteration short-circuits, then the remaining elements will be retained. + /// Use [`retain`] with a negated predicate if you do not need the returned iterator. + /// + /// [`retain`]: IndexMap::retain + /// + /// ***Panics*** if the starting point is greater than the end point or if + /// the end point is greater than the length of the map. + /// + /// # Examples + /// + /// Splitting a map into even and odd keys, reusing the original map: + /// + /// ``` + /// use indexmap::IndexMap; + /// + /// let mut map: IndexMap<i32, i32> = (0..8).map(|x| (x, x)).collect(); + /// let extracted: IndexMap<i32, i32> = map.extract_if(.., |k, _v| k % 2 == 0).collect(); + /// + /// let evens = extracted.keys().copied().collect::<Vec<_>>(); + /// let odds = map.keys().copied().collect::<Vec<_>>(); + /// + /// assert_eq!(evens, vec![0, 2, 4, 6]); + /// assert_eq!(odds, vec![1, 3, 5, 7]); + /// ``` + #[track_caller] + pub fn extract_if<F, R>(&mut self, range: R, pred: F) -> ExtractIf<'_, K, V, F> + where + F: FnMut(&K, &mut V) -> bool, + R: RangeBounds<usize>, + { + ExtractIf::new(&mut self.core, range, pred) + } + /// Splits the collection into two at the given index. /// /// Returns a newly allocated map containing the elements in the range @@ -1474,14 +1520,14 @@ /// /// ***Panics*** if `index` is out of bounds. fn index(&self, index: usize) -> &V { - self.get_index(index) - .unwrap_or_else(|| { - panic!( - "index out of bounds: the len is {len} but the index is {index}", - len = self.len() - ); - }) - .1 + if let Some((_, value)) = self.get_index(index) { + value + } else { + panic!( + "index out of bounds: the len is {len} but the index is {index}", + len = self.len() + ); + } } } @@ -1521,11 +1567,11 @@ fn index_mut(&mut self, index: usize) -> &mut V { let len: usize = self.len(); - self.get_index_mut(index) - .unwrap_or_else(|| { - panic!("index out of bounds: the len is {len} but the index is {index}"); - }) - .1 + if let Some((_, value)) = self.get_index_mut(index) { + value + } else { + panic!("index out of bounds: the len is {len} but the index is {index}"); + } } }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core.rs index 9022c8e..cd0a966 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core.rs
@@ -8,23 +8,23 @@ //! However, we should probably not let this show in the public API or docs. mod entry; +mod extract; pub mod raw_entry_v1; -use hashbrown::hash_table; - -use crate::vec::{self, Vec}; -use crate::TryReserveError; +use alloc::vec::{self, Vec}; use core::mem; use core::ops::RangeBounds; +use hashbrown::hash_table; use crate::util::simplify_range; -use crate::{Bucket, Equivalent, HashValue}; +use crate::{Bucket, Equivalent, HashValue, TryReserveError}; type Indices = hash_table::HashTable<usize>; type Entries<K, V> = Vec<Bucket<K, V>>; pub use entry::{Entry, IndexedEntry, OccupiedEntry, VacantEntry}; +pub(crate) use extract::ExtractCore; /// Core of the map that does not depend on S #[derive(Debug)] @@ -109,33 +109,6 @@ } } -impl<K, V> crate::Entries for IndexMapCore<K, V> { - type Entry = Bucket<K, V>; - - #[inline] - fn into_entries(self) -> Vec<Self::Entry> { - self.entries - } - - #[inline] - fn as_entries(&self) -> &[Self::Entry] { - &self.entries - } - - #[inline] - fn as_entries_mut(&mut self) -> &mut [Self::Entry] { - &mut self.entries - } - - fn with_entries<F>(&mut self, f: F) - where - F: FnOnce(&mut [Self::Entry]), - { - f(&mut self.entries); - self.rebuild_hash_table(); - } -} - impl<K, V> IndexMapCore<K, V> { /// The maximum capacity before the `entries` allocation would exceed `isize::MAX`. const MAX_ENTRIES_CAPACITY: usize = (isize::MAX as usize) / mem::size_of::<Bucket<K, V>>(); @@ -162,7 +135,31 @@ } #[inline] + pub(crate) fn into_entries(self) -> Entries<K, V> { + self.entries + } + + #[inline] + pub(crate) fn as_entries(&self) -> &[Bucket<K, V>] { + &self.entries + } + + #[inline] + pub(crate) fn as_entries_mut(&mut self) -> &mut [Bucket<K, V>] { + &mut self.entries + } + + pub(crate) fn with_entries<F>(&mut self, f: F) + where + F: FnOnce(&mut [Bucket<K, V>]), + { + f(&mut self.entries); + self.rebuild_hash_table(); + } + + #[inline] pub(crate) fn len(&self) -> usize { + debug_assert_eq!(self.entries.len(), self.indices.len()); self.indices.len() }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/entry.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/entry.rs index 6ab29ca..39a20d5 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/entry.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/entry.rs
@@ -308,6 +308,7 @@ /// ***Panics*** if the `other` index is out of bounds. /// /// Computes in **O(1)** time (average). + #[track_caller] pub fn swap_indices(self, other: usize) { let index = self.index(); self.into_ref_mut().swap_indices(index, other); @@ -407,6 +408,7 @@ /// ***Panics*** if `index` is out of bounds. /// /// Computes in **O(n)** time (average). + #[track_caller] pub fn shift_insert(mut self, index: usize, value: V) -> &'a mut V { self.map .shift_insert_unique(index, self.hash, self.key, value); @@ -546,6 +548,7 @@ /// ***Panics*** if the `other` index is out of bounds. /// /// Computes in **O(1)** time (average). + #[track_caller] pub fn swap_indices(mut self, other: usize) { self.map.swap_indices(self.index, other); }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/extract.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/extract.rs new file mode 100644 index 0000000..b2d29e1b --- /dev/null +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/extract.rs
@@ -0,0 +1,108 @@ +#![allow(unsafe_code)] + +use super::{Bucket, IndexMapCore}; +use crate::util::simplify_range; + +use core::ops::RangeBounds; + +impl<K, V> IndexMapCore<K, V> { + #[track_caller] + pub(crate) fn extract<R>(&mut self, range: R) -> ExtractCore<'_, K, V> + where + R: RangeBounds<usize>, + { + let range = simplify_range(range, self.entries.len()); + + // SAFETY: We must have consistent lengths to start, so that's a hard assertion. + // Then the worst `set_len` can do is leak items if `ExtractCore` doesn't drop. + assert_eq!(self.entries.len(), self.indices.len()); + unsafe { + self.entries.set_len(range.start); + } + ExtractCore { + map: self, + new_len: range.start, + current: range.start, + end: range.end, + } + } +} + +pub(crate) struct ExtractCore<'a, K, V> { + map: &'a mut IndexMapCore<K, V>, + new_len: usize, + current: usize, + end: usize, +} + +impl<K, V> Drop for ExtractCore<'_, K, V> { + fn drop(&mut self) { + let old_len = self.map.indices.len(); + let mut new_len = self.new_len; + + debug_assert!(new_len <= self.current); + debug_assert!(self.current <= self.end); + debug_assert!(self.current <= old_len); + debug_assert!(old_len <= self.map.entries.capacity()); + + // SAFETY: We assume `new_len` and `current` were correctly maintained by the iterator. + // So `entries[new_len..current]` were extracted, but the rest before and after are valid. + unsafe { + if new_len == self.current { + // Nothing was extracted, so any remaining items can be left in place. + new_len = old_len; + } else if self.current < old_len { + // Need to shift the remaining items down. + let tail_len = old_len - self.current; + let base = self.map.entries.as_mut_ptr(); + let src = base.add(self.current); + let dest = base.add(new_len); + src.copy_to(dest, tail_len); + new_len += tail_len; + } + self.map.entries.set_len(new_len); + } + + if new_len != old_len { + // We don't keep track of *which* items were extracted, so reindex everything. + self.map.rebuild_hash_table(); + } + } +} + +impl<K, V> ExtractCore<'_, K, V> { + pub(crate) fn extract_if<F>(&mut self, mut pred: F) -> Option<Bucket<K, V>> + where + F: FnMut(&mut Bucket<K, V>) -> bool, + { + debug_assert!(self.end <= self.map.entries.capacity()); + + let base = self.map.entries.as_mut_ptr(); + while self.current < self.end { + // SAFETY: We're maintaining both indices within bounds of the original entries, so + // 0..new_len and current..indices.len() are always valid items for our Drop to keep. + unsafe { + let item = base.add(self.current); + if pred(&mut *item) { + // Extract it! + self.current += 1; + return Some(item.read()); + } else { + // Keep it, shifting it down if needed. + if self.new_len != self.current { + debug_assert!(self.new_len < self.current); + let dest = base.add(self.new_len); + item.copy_to_nonoverlapping(dest, 1); + } + self.current += 1; + self.new_len += 1; + } + } + } + None + } + + pub(crate) fn remaining(&self) -> usize { + self.end - self.current + } +}
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/raw_entry_v1.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/raw_entry_v1.rs index 757a3cee..e76793b7 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/raw_entry_v1.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/raw_entry_v1.rs
@@ -566,6 +566,7 @@ /// ***Panics*** if `to` is out of bounds. /// /// Computes in **O(n)** time (average). + #[track_caller] pub fn move_index(self, to: usize) { let index = self.index(); self.into_ref_mut().move_index(index, to); @@ -579,6 +580,7 @@ /// ***Panics*** if the `other` index is out of bounds. /// /// Computes in **O(1)** time (average). + #[track_caller] pub fn swap_indices(self, other: usize) { let index = self.index(); self.into_ref_mut().swap_indices(index, other); @@ -629,6 +631,7 @@ /// ***Panics*** if `index` is out of bounds. /// /// Computes in **O(n)** time (average). + #[track_caller] pub fn shift_insert(self, index: usize, key: K, value: V) -> (&'a mut K, &'a mut V) where K: Hash, @@ -645,6 +648,7 @@ /// ***Panics*** if `index` is out of bounds. /// /// Computes in **O(n)** time (average). + #[track_caller] pub fn shift_insert_hashed_nocheck( mut self, index: usize,
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/iter.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/iter.rs index cce9abe..8f9350a 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/iter.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/iter.rs
@@ -1,5 +1,4 @@ -use super::core::IndexMapCore; -use super::{Bucket, Entries, IndexMap, Slice}; +use super::{Bucket, ExtractCore, IndexMap, IndexMapCore, Slice}; use alloc::vec::{self, Vec}; use core::fmt; @@ -774,3 +773,58 @@ .finish() } } + +/// An extracting iterator for `IndexMap`. +/// +/// This `struct` is created by [`IndexMap::extract_if()`]. +/// See its documentation for more. +pub struct ExtractIf<'a, K, V, F> { + inner: ExtractCore<'a, K, V>, + pred: F, +} + +impl<K, V, F> ExtractIf<'_, K, V, F> { + #[track_caller] + pub(super) fn new<R>(core: &mut IndexMapCore<K, V>, range: R, pred: F) -> ExtractIf<'_, K, V, F> + where + R: RangeBounds<usize>, + F: FnMut(&K, &mut V) -> bool, + { + ExtractIf { + inner: core.extract(range), + pred, + } + } +} + +impl<K, V, F> Iterator for ExtractIf<'_, K, V, F> +where + F: FnMut(&K, &mut V) -> bool, +{ + type Item = (K, V); + + fn next(&mut self) -> Option<Self::Item> { + self.inner + .extract_if(|bucket| { + let (key, value) = bucket.ref_mut(); + (self.pred)(key, value) + }) + .map(Bucket::key_value) + } + + fn size_hint(&self) -> (usize, Option<usize>) { + (0, Some(self.inner.remaining())) + } +} + +impl<K, V, F> FusedIterator for ExtractIf<'_, K, V, F> where F: FnMut(&K, &mut V) -> bool {} + +impl<K, V, F> fmt::Debug for ExtractIf<'_, K, V, F> +where + K: fmt::Debug, + V: fmt::Debug, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("ExtractIf").finish_non_exhaustive() + } +}
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/mutable.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/mutable.rs index e429c8b..c7cf9db1 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/mutable.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/mutable.rs
@@ -1,8 +1,7 @@ use core::hash::{BuildHasher, Hash}; use super::{ - Bucket, Entries, Entry, Equivalent, IndexMap, IndexedEntry, IterMut2, OccupiedEntry, - VacantEntry, + Bucket, Entry, Equivalent, IndexMap, IndexedEntry, IterMut2, OccupiedEntry, VacantEntry, }; /// Opt-in mutable access to [`IndexMap`] keys.
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/slice.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/slice.rs index 035744ef..b0537a30 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/slice.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/slice.rs
@@ -1,6 +1,5 @@ use super::{ - Bucket, Entries, IndexMap, IntoIter, IntoKeys, IntoValues, Iter, IterMut, Keys, Values, - ValuesMut, + Bucket, IndexMap, IntoIter, IntoKeys, IntoValues, Iter, IterMut, Keys, Values, ValuesMut, }; use crate::util::{slice_eq, try_simplify_range}; use crate::GetDisjointMutError; @@ -125,6 +124,7 @@ /// Divides one slice into two at an index. /// /// ***Panics*** if `index > len`. + #[track_caller] pub fn split_at(&self, index: usize) -> (&Self, &Self) { let (first, second) = self.entries.split_at(index); (Self::from_slice(first), Self::from_slice(second)) @@ -133,6 +133,7 @@ /// Divides one mutable slice into two at an index. /// /// ***Panics*** if `index > len`. + #[track_caller] pub fn split_at_mut(&mut self, index: usize) -> (&mut Self, &mut Self) { let (first, second) = self.entries.split_at_mut(index); (Self::from_mut_slice(first), Self::from_mut_slice(second)) @@ -628,4 +629,123 @@ } } } + + #[test] + fn slice_new() { + let slice: &Slice<i32, i32> = Slice::new(); + assert!(slice.is_empty()); + assert_eq!(slice.len(), 0); + } + + #[test] + fn slice_new_mut() { + let slice: &mut Slice<i32, i32> = Slice::new_mut(); + assert!(slice.is_empty()); + assert_eq!(slice.len(), 0); + } + + #[test] + fn slice_get_index_mut() { + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + + { + let (key, value) = slice.get_index_mut(0).unwrap(); + assert_eq!(*key, 0); + assert_eq!(*value, 0); + + *value = 11; + } + + assert_eq!(slice[0], 11); + + { + let result = slice.get_index_mut(11); + assert!(result.is_none()); + } + } + + #[test] + fn slice_split_first() { + let slice: &mut Slice<i32, i32> = Slice::new_mut(); + let result = slice.split_first(); + assert!(result.is_none()); + + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + + { + let (first, rest) = slice.split_first().unwrap(); + assert_eq!(first, (&0, &0)); + assert_eq!(rest.len(), 9); + } + assert_eq!(slice.len(), 10); + } + + #[test] + fn slice_split_first_mut() { + let slice: &mut Slice<i32, i32> = Slice::new_mut(); + let result = slice.split_first_mut(); + assert!(result.is_none()); + + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + + { + let (first, rest) = slice.split_first_mut().unwrap(); + assert_eq!(first, (&0, &mut 0)); + assert_eq!(rest.len(), 9); + + *first.1 = 11; + } + assert_eq!(slice.len(), 10); + assert_eq!(slice[0], 11); + } + + #[test] + fn slice_split_last() { + let slice: &mut Slice<i32, i32> = Slice::new_mut(); + let result = slice.split_last(); + assert!(result.is_none()); + + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + + { + let (last, rest) = slice.split_last().unwrap(); + assert_eq!(last, (&9, &81)); + assert_eq!(rest.len(), 9); + } + assert_eq!(slice.len(), 10); + } + + #[test] + fn slice_split_last_mut() { + let slice: &mut Slice<i32, i32> = Slice::new_mut(); + let result = slice.split_last_mut(); + assert!(result.is_none()); + + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + + { + let (last, rest) = slice.split_last_mut().unwrap(); + assert_eq!(last, (&9, &mut 81)); + assert_eq!(rest.len(), 9); + + *last.1 = 100; + } + + assert_eq!(slice.len(), 10); + assert_eq!(slice[slice.len() - 1], 100); + } + + #[test] + fn slice_get_range() { + let mut map: IndexMap<i32, i32> = (0..10).map(|i| (i, i * i)).collect(); + let slice: &mut Slice<i32, i32> = map.as_mut_slice(); + let subslice = slice.get_range(3..6).unwrap(); + assert_eq!(subslice.len(), 3); + assert_eq!(subslice, &[(3, 9), (4, 16), (5, 25)]); + } }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/tests.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/tests.rs index f97f2f14..25ef7947 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/tests.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/tests.rs
@@ -594,6 +594,226 @@ } #[test] +fn get_index_mut2() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.insert(1, 2); + map.insert(3, 4); + map.insert(5, 6); + + { + let (key, value) = map.get_index_mut2(0).unwrap(); + assert_eq!(*key, 1); + assert_eq!(*value, 2); + + *value = 7; + } + assert_eq!(map[0], 7); + + { + let (key, _) = map.get_index_mut2(0).unwrap(); + *key = 8; + } + assert_eq!(map.get_index(0).unwrap().0, &8); +} + +#[test] +fn shift_shift_remove_index() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.insert(1, 2); + map.insert(3, 4); + map.insert(5, 6); + map.insert(7, 8); + map.insert(9, 10); + + let result = map.shift_remove_index(1); + assert_eq!(result, Some((3, 4))); + assert_eq!(map.len(), 4); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8), (9, 10)]); + + let result = map.shift_remove_index(1); + assert_eq!(result, Some((5, 6))); + assert_eq!(map.len(), 3); + assert_eq!(map.as_slice(), &[(1, 2), (7, 8), (9, 10)]); + + let result = map.shift_remove_index(2); + assert_eq!(result, Some((9, 10))); + assert_eq!(map.len(), 2); + assert_eq!(map.as_slice(), &[(1, 2), (7, 8)]); + + let result = map.shift_remove_index(2); + assert_eq!(result, None); + assert_eq!(map.len(), 2); + assert_eq!(map.as_slice(), &[(1, 2), (7, 8)]); +} + +#[test] +fn shift_remove_entry() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.insert(1, 2); + map.insert(3, 4); + map.insert(5, 6); + map.insert(7, 8); + map.insert(9, 10); + + let result = map.shift_remove_entry(&3); + assert_eq!(result, Some((3, 4))); + assert_eq!(map.len(), 4); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8), (9, 10)]); + + let result = map.shift_remove_entry(&9); + assert_eq!(result, Some((9, 10))); + assert_eq!(map.len(), 3); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8)]); + + let result = map.shift_remove_entry(&9); + assert_eq!(result, None); + assert_eq!(map.len(), 3); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8)]); +} + +#[test] +fn shift_remove_full() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.insert(1, 2); + map.insert(3, 4); + map.insert(5, 6); + map.insert(7, 8); + map.insert(9, 10); + + let result = map.shift_remove_full(&3); + assert_eq!(result, Some((1, 3, 4))); + assert_eq!(map.len(), 4); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8), (9, 10)]); + + let result = map.shift_remove_full(&9); + assert_eq!(result, Some((3, 9, 10))); + assert_eq!(map.len(), 3); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8)]); + + let result = map.shift_remove_full(&9); + assert_eq!(result, None); + assert_eq!(map.len(), 3); + assert_eq!(map.as_slice(), &[(1, 2), (5, 6), (7, 8)]); +} + +#[test] +fn sorted_unstable_by() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.extend(vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50)]); + let sorted = map.sorted_unstable_by(|_a, b, _c, d| d.cmp(&b)); + + assert_eq!( + sorted.as_slice(), + &[(5, 50), (4, 40), (3, 30), (2, 20), (1, 10)] + ); +} + +#[test] +fn into_boxed_slice() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + for i in 0..5 { + map.insert(i, i * 10); + } + let boxed_slice: Box<Slice<i32, i32>> = map.into_boxed_slice(); + assert_eq!(boxed_slice.len(), 5); + assert_eq!( + boxed_slice.as_ref(), + &[(0, 0), (1, 10), (2, 20), (3, 30), (4, 40)] + ); +} + +#[test] +fn last_mut() { + let mut map: IndexMap<&str, i32> = IndexMap::new(); + + let last_entry = map.last_mut(); + assert_eq!(last_entry, None); + + map.insert("key1", 1); + map.insert("key2", 2); + map.insert("key3", 3); + let last_entry = map.last_mut(); + assert_eq!(last_entry, Some((&"key3", &mut 3))); + + *last_entry.unwrap().1 = 4; + assert_eq!(map.get("key3"), Some(&4)); +} + +#[test] +#[should_panic = "index out of bounds"] +fn insert_before_oob() { + let mut map: IndexMap<char, ()> = IndexMap::new(); + let _ = map.insert_before(0, 'a', ()); + let _ = map.insert_before(1, 'b', ()); + map.insert_before(3, 'd', ()); +} + +#[test] +fn clear() { + let mut map: IndexMap<i32, i32> = IndexMap::new(); + map.extend(vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50)]); + map.clear(); + assert_eq!(map.len(), 0); +} + +#[test] +fn get_range() { + let mut index_map: IndexMap<i32, i32> = IndexMap::new(); + index_map.insert(1, 10); + index_map.insert(2, 20); + index_map.insert(3, 30); + index_map.insert(4, 40); + index_map.insert(5, 50); + + let result = index_map.get_range(2..2); + assert!(result.unwrap().is_empty()); + + let result = index_map.get_range(4..2); + assert!(result.is_none()); + + let result = index_map.get_range(2..4); + let slice: &Slice<i32, i32> = result.unwrap(); + assert_eq!(slice.len(), 2); + assert_eq!(slice, &[(3, 30), (4, 40)]); +} + +#[test] +fn get_range_mut() { + let mut index_map: IndexMap<i32, i32> = IndexMap::new(); + index_map.insert(1, 10); + index_map.insert(2, 20); + index_map.insert(3, 30); + index_map.insert(4, 40); + index_map.insert(5, 50); + + let result = index_map.get_range_mut(2..2); + assert!(result.unwrap().is_empty()); + + let result = index_map.get_range_mut(4..2); + assert!(result.is_none()); + + let result = index_map.get_range_mut(2..4); + let slice: &mut Slice<i32, i32> = result.unwrap(); + assert_eq!(slice.len(), 2); + assert_eq!(slice, &mut [(3, 30), (4, 40)]); + + for i in 0..slice.len() { + slice[i] += 1; + } + assert_eq!(slice, &mut [(3, 31), (4, 41)]); +} + +#[test] +#[should_panic = "index out of bounds"] +fn shift_insert_oob() { + let mut map: IndexMap<u32, u32> = IndexMap::new(); + map.shift_insert(0, 1, 10); + map.shift_insert(1, 2, 20); + map.shift_insert(2, 3, 30); + map.shift_insert(5, 4, 40); +} + +#[test] fn test_binary_search_by() { // adapted from std's test for binary_search let b: IndexMap<_, i32> = []
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/map.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/map.rs index 8236cf70..995367f 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/map.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/map.rs
@@ -7,8 +7,8 @@ use rayon::iter::plumbing::{Consumer, ProducerCallback, UnindexedConsumer}; use rayon::prelude::*; -use crate::vec::Vec; use alloc::boxed::Box; +use alloc::vec::Vec; use core::cmp::Ordering; use core::fmt; use core::hash::{BuildHasher, Hash}; @@ -16,7 +16,6 @@ use crate::map::Slice; use crate::Bucket; -use crate::Entries; use crate::IndexMap; impl<K, V, S> IntoParallelIterator for IndexMap<K, V, S>
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/mod.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/mod.rs index 84ce02d..73e7fa0 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/mod.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/mod.rs
@@ -3,8 +3,7 @@ use rayon::prelude::*; use alloc::collections::LinkedList; - -use crate::vec::Vec; +use alloc::vec::Vec; pub mod map; pub mod set;
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/set.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/set.rs index 3904234b..60e7e04f 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/set.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/rayon/set.rs
@@ -7,15 +7,14 @@ use rayon::iter::plumbing::{Consumer, ProducerCallback, UnindexedConsumer}; use rayon::prelude::*; -use crate::vec::Vec; use alloc::boxed::Box; +use alloc::vec::Vec; use core::cmp::Ordering; use core::fmt; use core::hash::{BuildHasher, Hash}; use core::ops::RangeBounds; use crate::set::Slice; -use crate::Entries; use crate::IndexSet; type Bucket<T> = crate::Bucket<T, ()>;
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set.rs index 1be248e..3e54463e 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set.rs
@@ -8,7 +8,7 @@ mod tests; pub use self::iter::{ - Difference, Drain, Intersection, IntoIter, Iter, Splice, SymmetricDifference, Union, + Difference, Drain, ExtractIf, Intersection, IntoIter, Iter, Splice, SymmetricDifference, Union, }; pub use self::mutable::MutableValues; pub use self::slice::Slice; @@ -28,7 +28,7 @@ use core::hash::{BuildHasher, Hash}; use core::ops::{BitAnd, BitOr, BitXor, Index, RangeBounds, Sub}; -use super::{Entries, Equivalent, IndexMap}; +use super::{Equivalent, IndexMap}; type Bucket<T> = super::Bucket<T, ()>; @@ -105,32 +105,6 @@ } } -impl<T, S> Entries for IndexSet<T, S> { - type Entry = Bucket<T>; - - #[inline] - fn into_entries(self) -> Vec<Self::Entry> { - self.map.into_entries() - } - - #[inline] - fn as_entries(&self) -> &[Self::Entry] { - self.map.as_entries() - } - - #[inline] - fn as_entries_mut(&mut self) -> &mut [Self::Entry] { - self.map.as_entries_mut() - } - - fn with_entries<F>(&mut self, f: F) - where - F: FnOnce(&mut [Self::Entry]), - { - self.map.with_entries(f); - } -} - impl<T, S> fmt::Debug for IndexSet<T, S> where T: fmt::Debug, @@ -189,6 +163,23 @@ } } + #[inline] + pub(crate) fn into_entries(self) -> Vec<Bucket<T>> { + self.map.into_entries() + } + + #[inline] + pub(crate) fn as_entries(&self) -> &[Bucket<T>] { + self.map.as_entries() + } + + pub(crate) fn with_entries<F>(&mut self, f: F) + where + F: FnOnce(&mut [Bucket<T>]), + { + self.map.with_entries(f); + } + /// Return the number of elements the set can hold without reallocating. /// /// This number is a lower bound; the set might be able to hold more, @@ -258,6 +249,52 @@ Drain::new(self.map.core.drain(range)) } + /// Creates an iterator which uses a closure to determine if a value should be removed, + /// for all values in the given range. + /// + /// If the closure returns true, then the value is removed and yielded. + /// If the closure returns false, the value will remain in the list and will not be yielded + /// by the iterator. + /// + /// The range may be any type that implements [`RangeBounds<usize>`], + /// including all of the `std::ops::Range*` types, or even a tuple pair of + /// `Bound` start and end values. To check the entire set, use `RangeFull` + /// like `set.extract_if(.., predicate)`. + /// + /// If the returned `ExtractIf` is not exhausted, e.g. because it is dropped without iterating + /// or the iteration short-circuits, then the remaining elements will be retained. + /// Use [`retain`] with a negated predicate if you do not need the returned iterator. + /// + /// [`retain`]: IndexSet::retain + /// + /// ***Panics*** if the starting point is greater than the end point or if + /// the end point is greater than the length of the set. + /// + /// # Examples + /// + /// Splitting a set into even and odd values, reusing the original set: + /// + /// ``` + /// use indexmap::IndexSet; + /// + /// let mut set: IndexSet<i32> = (0..8).collect(); + /// let extracted: IndexSet<i32> = set.extract_if(.., |v| v % 2 == 0).collect(); + /// + /// let evens = extracted.into_iter().collect::<Vec<_>>(); + /// let odds = set.into_iter().collect::<Vec<_>>(); + /// + /// assert_eq!(evens, vec![0, 2, 4, 6]); + /// assert_eq!(odds, vec![1, 3, 5, 7]); + /// ``` + #[track_caller] + pub fn extract_if<F, R>(&mut self, range: R, pred: F) -> ExtractIf<'_, T, F> + where + F: FnMut(&T) -> bool, + R: RangeBounds<usize>, + { + ExtractIf::new(&mut self.map.core, range, pred) + } + /// Splits the collection into two at the given index. /// /// Returns a newly allocated set containing the elements in the range @@ -1106,12 +1143,14 @@ /// /// ***Panics*** if `index` is out of bounds. fn index(&self, index: usize) -> &T { - self.get_index(index).unwrap_or_else(|| { + if let Some(value) = self.get_index(index) { + value + } else { panic!( "index out of bounds: the len is {len} but the index is {index}", len = self.len() ); - }) + } } }
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/iter.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/iter.rs index 34433164..9ea81023 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/iter.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/iter.rs
@@ -1,4 +1,6 @@ -use super::{Bucket, Entries, IndexSet, Slice}; +use crate::map::{ExtractCore, IndexMapCore}; + +use super::{Bucket, IndexSet, Slice}; use alloc::vec::{self, Vec}; use core::fmt; @@ -626,3 +628,54 @@ fmt::Debug::fmt(&self.0, f) } } + +/// An extracting iterator for `IndexSet`. +/// +/// This `struct` is created by [`IndexSet::extract_if()`]. +/// See its documentation for more. +pub struct ExtractIf<'a, T, F> { + inner: ExtractCore<'a, T, ()>, + pred: F, +} + +impl<T, F> ExtractIf<'_, T, F> { + #[track_caller] + pub(super) fn new<R>(core: &mut IndexMapCore<T, ()>, range: R, pred: F) -> ExtractIf<'_, T, F> + where + R: RangeBounds<usize>, + F: FnMut(&T) -> bool, + { + ExtractIf { + inner: core.extract(range), + pred, + } + } +} + +impl<T, F> Iterator for ExtractIf<'_, T, F> +where + F: FnMut(&T) -> bool, +{ + type Item = T; + + fn next(&mut self) -> Option<Self::Item> { + self.inner + .extract_if(|bucket| (self.pred)(bucket.key_ref())) + .map(Bucket::key) + } + + fn size_hint(&self) -> (usize, Option<usize>) { + (0, Some(self.inner.remaining())) + } +} + +impl<T, F> FusedIterator for ExtractIf<'_, T, F> where F: FnMut(&T) -> bool {} + +impl<T, F> fmt::Debug for ExtractIf<'_, T, F> +where + T: fmt::Debug, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("ExtractIf").finish_non_exhaustive() + } +}
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/slice.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/slice.rs index faa9041..ee79c8e 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/slice.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/slice.rs
@@ -1,4 +1,4 @@ -use super::{Bucket, Entries, IndexSet, IntoIter, Iter}; +use super::{Bucket, IndexSet, IntoIter, Iter}; use crate::util::{slice_eq, try_simplify_range}; use alloc::boxed::Box; @@ -85,6 +85,7 @@ /// Divides one slice into two at an index. /// /// ***Panics*** if `index > len`. + #[track_caller] pub fn split_at(&self, index: usize) -> (&Self, &Self) { let (first, second) = self.entries.split_at(index); (Self::from_slice(first), Self::from_slice(second))
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/tests.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/tests.rs index 35a076e..88a7ee8 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/tests.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/set/tests.rs
@@ -584,6 +584,282 @@ } #[test] +#[allow(deprecated)] +fn take() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(10); + assert_eq!(index_set.len(), 1); + + let result = index_set.take(&10); + assert_eq!(result, Some(10)); + assert_eq!(index_set.len(), 0); + + let result = index_set.take(&20); + assert_eq!(result, None); +} + +#[test] +fn swap_take() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(10); + index_set.insert(20); + index_set.insert(30); + index_set.insert(40); + assert_eq!(index_set.len(), 4); + + let result = index_set.swap_take(&20); + assert_eq!(result, Some(20)); + assert_eq!(index_set.len(), 3); + assert_eq!(index_set.as_slice(), &[10, 40, 30]); + + let result = index_set.swap_take(&50); + assert_eq!(result, None); +} + +#[test] +fn sort_unstable() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(30); + index_set.insert(20); + index_set.insert(10); + + index_set.sort_unstable(); + assert_eq!(index_set.as_slice(), &[10, 20, 30]); +} + +#[test] +fn try_reserve_exact() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(10); + index_set.insert(20); + index_set.insert(30); + index_set.shrink_to_fit(); + assert_eq!(index_set.capacity(), 3); + + index_set.try_reserve_exact(2).unwrap(); + assert_eq!(index_set.capacity(), 5); +} + +#[test] +fn shift_remove_full() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(10); + set.insert(20); + set.insert(30); + set.insert(40); + set.insert(50); + + let result = set.shift_remove_full(&20); + assert_eq!(result, Some((1, 20))); + assert_eq!(set.len(), 4); + assert_eq!(set.as_slice(), &[10, 30, 40, 50]); + + let result = set.shift_remove_full(&50); + assert_eq!(result, Some((3, 50))); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[10, 30, 40]); + + let result = set.shift_remove_full(&60); + assert_eq!(result, None); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[10, 30, 40]); +} + +#[test] +fn shift_remove_index() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(10); + set.insert(20); + set.insert(30); + set.insert(40); + set.insert(50); + + let result = set.shift_remove_index(1); + assert_eq!(result, Some(20)); + assert_eq!(set.len(), 4); + assert_eq!(set.as_slice(), &[10, 30, 40, 50]); + + let result = set.shift_remove_index(1); + assert_eq!(result, Some(30)); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[10, 40, 50]); + + let result = set.shift_remove_index(3); + assert_eq!(result, None); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[10, 40, 50]); +} + +#[test] +fn sort_unstable_by() { + let mut set: IndexSet<i32> = IndexSet::from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]); + set.sort_unstable_by(|a, b| b.cmp(a)); + assert_eq!(set.as_slice(), &[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]); +} + +#[test] +fn sort_by() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(3); + set.insert(1); + set.insert(2); + set.sort_by(|a, b| a.cmp(b)); + assert_eq!(set.as_slice(), &[1, 2, 3]); +} + +#[test] +fn drain() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(1); + set.insert(2); + set.insert(3); + + { + let drain = set.drain(0..2); + assert_eq!(drain.as_slice(), &[1, 2]); + } + + assert_eq!(set.len(), 1); + assert_eq!(set.as_slice(), &[3]); +} + +#[test] +fn split_off() { + let mut set: IndexSet<i32> = IndexSet::from([1, 2, 3, 4, 5]); + let split_set: IndexSet<i32> = set.split_off(3); + + assert_eq!(split_set.len(), 2); + assert_eq!(split_set.as_slice(), &[4, 5]); + + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[1, 2, 3]); +} + +#[test] +fn retain() { + let mut set: IndexSet<i32> = IndexSet::from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]); + set.retain(|&x| x > 4); + assert_eq!(set.len(), 6); + assert_eq!(set.as_slice(), &[5, 6, 7, 8, 9, 10]); + + set.retain(|_| false); + assert_eq!(set.len(), 0); +} + +#[test] +fn first() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(10); + index_set.insert(20); + index_set.insert(30); + + let result = index_set.first(); + assert_eq!(*result.unwrap(), 10); + + index_set.clear(); + let result = index_set.first(); + assert!(result.is_none()); +} + +#[test] +fn sort_by_cached_key() { + let mut index_set: IndexSet<i32> = IndexSet::new(); + index_set.insert(3); + index_set.insert(1); + index_set.insert(2); + index_set.insert(0); + index_set.sort_by_cached_key(|&x| -x); + assert_eq!(index_set.as_slice(), &[3, 2, 1, 0]); +} + +#[test] +fn insert_sorted() { + let mut set: IndexSet<i32> = IndexSet::<i32>::new(); + set.insert_sorted(1); + set.insert_sorted(3); + assert_eq!(set.insert_sorted(2), (1, true)); +} + +#[test] +fn binary_search() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(100); + set.insert(300); + set.insert(200); + set.insert(400); + let result = set.binary_search(&200); + assert_eq!(result, Ok(2)); + + let result = set.binary_search(&500); + assert_eq!(result, Err(4)); +} + +#[test] +fn sorted_unstable_by() { + let mut set: IndexSet<i32> = IndexSet::from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]); + set.sort_unstable_by(|a, b| b.cmp(a)); + assert_eq!(set.as_slice(), &[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]); +} + +#[test] +fn last() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(1); + set.insert(2); + set.insert(3); + set.insert(4); + set.insert(5); + set.insert(6); + + assert_eq!(set.last(), Some(&6)); + + set.pop(); + assert_eq!(set.last(), Some(&5)); + + set.clear(); + assert_eq!(set.last(), None); +} + +#[test] +fn get_range() { + let set: IndexSet<i32> = IndexSet::from([1, 2, 3, 4, 5]); + let result = set.get_range(0..3); + let slice: &Slice<i32> = result.unwrap(); + assert_eq!(slice, &[1, 2, 3]); + + let result = set.get_range(0..0); + assert_eq!(result.unwrap().len(), 0); + + let result = set.get_range(2..1); + assert!(result.is_none()); +} + +#[test] +fn shift_take() { + let mut set: IndexSet<i32> = IndexSet::new(); + set.insert(1); + set.insert(2); + set.insert(3); + set.insert(4); + set.insert(5); + + let result = set.shift_take(&2); + assert_eq!(result, Some(2)); + assert_eq!(set.len(), 4); + assert_eq!(set.as_slice(), &[1, 3, 4, 5]); + + let result = set.shift_take(&5); + assert_eq!(result, Some(5)); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[1, 3, 4]); + + let result = set.shift_take(&5); + assert_eq!(result, None); + assert_eq!(set.len(), 3); + assert_eq!(set.as_slice(), &[1, 3, 4]); +} + +#[test] fn test_binary_search_by() { // adapted from std's test for binary_search let b: IndexSet<i32> = [].into();
diff --git a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/tests/quick.rs b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/tests/quick.rs index 56afee72..e968211 100644 --- a/third_party/rust/chromium_crates_io/vendor/indexmap-v2/tests/quick.rs +++ b/third_party/rust/chromium_crates_io/vendor/indexmap-v2/tests/quick.rs
@@ -191,6 +191,47 @@ } } + fn extract_if_odd(insert: Vec<u8>) -> bool { + let mut map = IndexMap::new(); + for &x in &insert { + map.insert(x, x.to_string()); + } + + let (odd, even): (Vec<_>, Vec<_>) = map.keys().copied().partition(|k| k % 2 == 1); + + let extracted: Vec<_> = map + .extract_if(.., |k, _| k % 2 == 1) + .map(|(k, _)| k) + .collect(); + + even.iter().all(|k| map.contains_key(k)) + && map.keys().eq(&even) + && extracted == odd + } + + fn extract_if_odd_limit(insert: Vec<u8>, limit: usize) -> bool { + let mut map = IndexMap::new(); + for &x in &insert { + map.insert(x, x.to_string()); + } + let limit = limit % (map.len() + 1); + + let mut i = 0; + let (odd, other): (Vec<_>, Vec<_>) = map.keys().copied().partition(|k| { + k % 2 == 1 && i < limit && { i += 1; true } + }); + + let extracted: Vec<_> = map + .extract_if(.., |k, _| k % 2 == 1) + .map(|(k, _)| k) + .take(limit) + .collect(); + + other.iter().all(|k| map.contains_key(k)) + && map.keys().eq(&other) + && extracted == odd + } + fn shift_remove(insert: Vec<u8>, remove: Vec<u8>) -> bool { let mut map = IndexMap::new(); for &key in &insert {
diff --git a/third_party/rust/indexmap/v2/BUILD.gn b/third_party/rust/indexmap/v2/BUILD.gn index 66eebda6..1c47cb1 100644 --- a/third_party/rust/indexmap/v2/BUILD.gn +++ b/third_party/rust/indexmap/v2/BUILD.gn
@@ -22,6 +22,7 @@ "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map.rs", "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core.rs", "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/entry.rs", + "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/extract.rs", "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/core/raw_entry_v1.rs", "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/iter.rs", "//third_party/rust/chromium_crates_io/vendor/indexmap-v2/src/map/mutable.rs", @@ -46,7 +47,7 @@ cargo_pkg_name = "indexmap" cargo_pkg_description = "A hash table with consistent order and fast iteration." - cargo_pkg_version = "2.9.0" + cargo_pkg_version = "2.10.0" allow_unsafe = true
diff --git a/third_party/rust/indexmap/v2/README.chromium b/third_party/rust/indexmap/v2/README.chromium index 06a6e9f..890d895df 100644 --- a/third_party/rust/indexmap/v2/README.chromium +++ b/third_party/rust/indexmap/v2/README.chromium
@@ -1,7 +1,7 @@ Name: indexmap URL: https://crates.io/crates/indexmap -Version: 2.9.0 -Revision: 1818d4140d86aeef18c515f1b060a3fa68da2708 +Version: 2.10.0 +Revision: 91dbcc55d2b6be52b7f99929aebb7204a6576189 Update Mechanism: Manual License: Apache-2.0 License File: //third_party/rust/chromium_crates_io/vendor/indexmap-v2/LICENSE-APACHE
diff --git a/third_party/tflite/BUILD.gn b/third_party/tflite/BUILD.gn index 93ded81..7b5ab3c 100644 --- a/third_party/tflite/BUILD.gn +++ b/third_party/tflite/BUILD.gn
@@ -1405,8 +1405,8 @@ "src/tensorflow/lite/tools/utils.h", ] deps = [ - ":tflite_builtin_op_resolver_standalone", - ":tflite_standalone", + ":tflite", + ":tflite_builtin_op_resolver", ":tflite_tools_proto", "//third_party/abseil-cpp:absl", "//third_party/ruy",
diff --git a/third_party/tflite/tflite_target.gni b/third_party/tflite/tflite_target.gni index c4d3e3c..8818df5 100644 --- a/third_party/tflite/tflite_target.gni +++ b/third_party/tflite/tflite_target.gni
@@ -3,8 +3,9 @@ # found in the LICENSE file. # There are two distinct variants of tflite: -# . One that depends upon //base. -# . One that does not depend upon //base. +# - One that depends upon //base. +# - One that does not depend upon //base. +# - Used only when `build_with_internal_optimization_guide` is true. # Dealing with this necessitates two distinct targets, one containing the # dependency on base and the other containing no dependency on base. The # templates in this file help ease this pain by generating the two targets. @@ -36,6 +37,8 @@ # conditional_deps = [ ":tflite_internal" ] # } +import("//components/optimization_guide/features.gni") + # Set of variables that are forwarded to the actual target. minimal_vars_to_forward_to_target = [ "cflags", @@ -49,6 +52,13 @@ "visibility", ] +declare_args() { + tflite_target_types = [ "" ] + if (build_with_internal_optimization_guide) { + tflite_target_types += [ "_standalone" ] + } +} + # Shared template used by all other templates. template("tflite_target_gen") { assert(defined(invoker.target_type), @@ -56,11 +66,7 @@ # Loop through twice, once for the target depending on base, and again for the # target that does not depend on base. - foreach(type, - [ - "", - "_standalone", - ]) { + foreach(type, tflite_target_types) { target(invoker.target_type, target_name + type) { forward_variables_from(invoker, minimal_vars_to_forward_to_target) if (defined(invoker.conditional_deps)) {
diff --git a/third_party/xnnpack/BUILD.gn b/third_party/xnnpack/BUILD.gn index c3eccad..fb9bac7 100644 --- a/third_party/xnnpack/BUILD.gn +++ b/third_party/xnnpack/BUILD.gn
@@ -15,6 +15,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # import("//build/config/android/config.gni") +import("//components/optimization_guide/features.gni") import("//third_party/xnnpack/build_defs.gni") config("xnnpack_public_config") { @@ -545,505 +546,507 @@ ":xx-transposev_x64", ] - xnnpack_standalone_deps = [ - ":configs_x64_standalone", - ":enums_x64_standalone", - ":f16-avgpool_f16c-no-avx2-no-fma_standalone", - ":f16-dwconv_f16c-fma-no-avx2_standalone", - ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f16-f32-vcvt_f16c-no-avx2-no-fma_standalone", - ":f16-f32-vcvt_sse2-no-sse3_standalone", - ":f16-f32-vcvt_sse4.1-no-sse4.2_standalone", - ":f16-f32-vcvt_x64_standalone", - ":f16-f32acc-gemm_f16c-fma-avx2_standalone", - ":f16-f32acc-igemm_f16c-fma-avx2_standalone", - ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone", - ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone", - ":f16-ibilinear_f16c-fma-no-avx2_standalone", - ":f16-maxpool_f16c-fma-avx2_standalone", - ":f16-maxpool_sse4.1-no-sse4.2_standalone", - ":f16-qs8-vcvt_x64_standalone", - ":f16-qu8-vcvt_x64_standalone", - ":f16-raddstoreexpminusmax_f16c-fma-avx2_standalone", - ":f16-rdminmax_x64_standalone", - ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone", - ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f16-rminmax_f16c-no-avx2-no-fma_standalone", - ":f16-rminmax_x64_standalone", - ":f16-vapproxgelu_x64_standalone", - ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone", - ":f16-vbinary_f16c-no-avx2-no-fma_standalone", - ":f16-vclamp_f16c-no-avx2-no-fma_standalone", - ":f16-vcos_x64_standalone", - ":f16-velu_f16c-fma-avx2_standalone", - ":f16-vexp_x64_standalone", - ":f16-vgelu_x64_standalone", - ":f16-vhswish_f16c-no-avx2-no-fma_standalone", - ":f16-vlrelu_f16c-no-avx2-no-fma_standalone", - ":f16-vmulcaddc_f16c-fma-no-avx2_standalone", - ":f16-vrnd_f16c-no-avx2-no-fma_standalone", - ":f16-vrsqrt_f16c-no-avx2-no-fma_standalone", - ":f16-vsigmoid_f16c-fma-avx2_standalone", - ":f16-vsin_x64_standalone", - ":f16-vsqrt_f16c-no-avx2-no-fma_standalone", - ":f16-vtanh_f16c-fma-no-avx2_standalone", - ":f16-vtanh_f16c-no-avx2-no-fma_standalone", - ":f16-vunary_f16c-no-avx2-no-fma_standalone", - ":f16-vunary_sse2-no-sse3_standalone", - ":f32-argmaxpool_sse2-no-sse3_standalone", - ":f32-argmaxpool_x64_standalone", - ":f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-avgpool_avx512f_standalone", - ":f32-avgpool_sse2-no-sse3_standalone", - ":f32-avgpool_x64_standalone", - ":f32-conv-hwc2chw_sse-no-sse2_standalone", - ":f32-conv-hwc2chw_x64_standalone", - ":f32-dwconv2d-chw_sse-no-sse2_standalone", - ":f32-dwconv2d-chw_ssse3-no-sse4.1_standalone", - ":f32-dwconv2d-chw_x64_standalone", - ":f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-dwconv_avx512f_standalone", - ":f32-dwconv_f16c-fma-no-avx2_standalone", - ":f32-dwconv_sse-no-sse2_standalone", - ":f32-dwconv_x64_standalone", - ":f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f32-f16-vcvt_f16c-no-avx2-no-fma_standalone", - ":f32-f16-vcvt_sse2-no-sse3_standalone", - ":f32-f16-vcvt_sse4.1-no-sse4.2_standalone", - ":f32-f16-vcvt_x64_standalone", - ":f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-gemm_avx512f_standalone", - ":f32-gemm_f16c-fma-no-avx2_standalone", - ":f32-gemm_sse-no-sse2_standalone", - ":f32-gemm_x64_standalone", - ":f32-ibilinear-chw_sse-no-sse2_standalone", - ":f32-ibilinear-chw_x64_standalone", - ":f32-ibilinear_sse-no-sse2_standalone", - ":f32-ibilinear_x64_standalone", - ":f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-igemm_avx512f_standalone", - ":f32-igemm_f16c-fma-no-avx2_standalone", - ":f32-igemm_sse-no-sse2_standalone", - ":f32-igemm_x64_standalone", - ":f32-maxpool_sse2-no-sse3_standalone", - ":f32-maxpool_x64_standalone", - ":f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-qc4w-gemm_f16c-fma-avx2_standalone", - ":f32-qc4w-gemm_f16c-fma-no-avx2_standalone", - ":f32-qc4w-gemm_sse4.1-no-sse4.2_standalone", - ":f32-qc4w-gemm_x64_standalone", - ":f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-qc8w-gemm_f16c-fma-avx2_standalone", - ":f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f32-qc8w-gemm_f16c-fma-no-avx2_standalone", - ":f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", - ":f32-qc8w-gemm_x64_standalone", - ":f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-qs8-vcvt_f16c-fma-avx2_standalone", - ":f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f32-qs8-vcvt_sse2-no-sse3_standalone", - ":f32-qs8-vcvt_sse4.1-no-sse4.2_standalone", - ":f32-qs8-vcvt_x64_standalone", - ":f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-qu8-vcvt_f16c-fma-avx2_standalone", - ":f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f32-qu8-vcvt_sse2-no-sse3_standalone", - ":f32-qu8-vcvt_x64_standalone", - ":f32-raddstoreexpminusmax_avx512f_standalone", - ":f32-raddstoreexpminusmax_f16c-fma-avx2_standalone", - ":f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":f32-raddstoreexpminusmax_sse2-no-sse3_standalone", - ":f32-raddstoreexpminusmax_x64_standalone", - ":f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-rdminmax_avx512f_standalone", - ":f32-rdminmax_sse2-no-sse3_standalone", - ":f32-rdminmax_x64_standalone", - ":f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-rdsum_avx512f_standalone", - ":f32-rdsum_sse2-no-sse3_standalone", - ":f32-rdsum_x64_standalone", - ":f32-rminmax_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-rminmax_avx512f_standalone", - ":f32-rminmax_sse-no-sse2_standalone", - ":f32-rminmax_x64_standalone", - ":f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-rsum_avx512f_standalone", - ":f32-rsum_sse2-no-sse3_standalone", - ":f32-rsum_x64_standalone", - ":f32-spmm_sse-no-sse2_standalone", - ":f32-spmm_x64_standalone", - ":f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vapproxgelu_avx512f_standalone", - ":f32-vapproxgelu_f16c-fma-no-avx2_standalone", - ":f32-vapproxgelu_sse2-no-sse3_standalone", - ":f32-vapproxgelu_x64_standalone", - ":f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vbinary_avx512f_standalone", - ":f32-vbinary_sse-no-sse2_standalone", - ":f32-vbinary_sse2-no-sse3_standalone", - ":f32-vbinary_x64_standalone", - ":f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vclamp_avx512f_standalone", - ":f32-vclamp_sse2-no-sse3_standalone", - ":f32-vclamp_x64_standalone", - ":f32-vcmul_avx512f_standalone", - ":f32-vcmul_f16c-fma-no-avx2_standalone", - ":f32-vcmul_sse-no-sse2_standalone", - ":f32-vcmul_x64_standalone", - ":f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vcopysign_avx512f_standalone", - ":f32-vcopysign_sse2-no-sse3_standalone", - ":f32-vcopysign_x64_standalone", - ":f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vcos_avx512f_standalone", - ":f32-vcos_f16c-fma-no-avx2_standalone", - ":f32-vcos_sse2-no-sse3_standalone", - ":f32-vcos_x64_standalone", - ":f32-velu_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-velu_avx512f_standalone", - ":f32-velu_f16c-fma-avx2_standalone", - ":f32-velu_sse2-no-sse3_standalone", - ":f32-velu_x64_standalone", - ":f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vexp_avx512f_standalone", - ":f32-vexp_f16c-fma-no-avx2_standalone", - ":f32-vexp_sse2-no-sse3_standalone", - ":f32-vexp_x64_standalone", - ":f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vgelu_avx512f_standalone", - ":f32-vgelu_f16c-fma-no-avx2_standalone", - ":f32-vgelu_sse2-no-sse3_standalone", - ":f32-vgelu_x64_standalone", - ":f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vhswish_avx512f_standalone", - ":f32-vhswish_f16c-fma-no-avx2_standalone", - ":f32-vhswish_sse2-no-sse3_standalone", - ":f32-vhswish_x64_standalone", - ":f32-vlog_avx512f_standalone", - ":f32-vlog_f16c-fma-avx2_standalone", - ":f32-vlog_f16c-fma-no-avx2_standalone", - ":f32-vlog_sse2-no-sse3_standalone", - ":f32-vlog_x64_standalone", - ":f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vlrelu_avx512f_standalone", - ":f32-vlrelu_sse-no-sse2_standalone", - ":f32-vlrelu_sse4.1-no-sse4.2_standalone", - ":f32-vlrelu_x64_standalone", - ":f32-vmulcaddc_sse-no-sse2_standalone", - ":f32-vmulcaddc_x64_standalone", - ":f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vrnd_avx512f_standalone", - ":f32-vrnd_sse2-no-sse3_standalone", - ":f32-vrnd_sse4.1-no-sse4.2_standalone", - ":f32-vrnd_x64_standalone", - ":f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vrsqrt_avx512f_standalone", - ":f32-vrsqrt_sse2-no-sse3_standalone", - ":f32-vrsqrt_x64_standalone", - ":f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vsigmoid_avx512f_standalone", - ":f32-vsigmoid_f16c-fma-avx2_standalone", - ":f32-vsigmoid_sse2-no-sse3_standalone", - ":f32-vsigmoid_sse4.1-no-sse4.2_standalone", - ":f32-vsigmoid_x64_standalone", - ":f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vsin_avx512f_standalone", - ":f32-vsin_f16c-fma-no-avx2_standalone", - ":f32-vsin_sse2-no-sse3_standalone", - ":f32-vsin_x64_standalone", - ":f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vsqrt_avx512f_standalone", - ":f32-vsqrt_sse2-no-sse3_standalone", - ":f32-vsqrt_x64_standalone", - ":f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vtanh_avx512f_standalone", - ":f32-vtanh_f16c-fma-no-avx2_standalone", - ":f32-vtanh_sse2-no-sse3_standalone", - ":f32-vtanh_x64_standalone", - ":f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone", - ":f32-vunary_avx512f_standalone", - ":f32-vunary_sse2-no-sse3_standalone", - ":f32-vunary_x64_standalone", - ":operators_x64_standalone", - ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone", - ":qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f32-qb4w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone", - ":qd8-f32-qb4w-gemm_x64_standalone", - ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f32-qc4w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone", - ":qd8-f32-qc4w-gemm_x64_standalone", - ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f32-qc8w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", - ":qd8-f32-qc8w-gemm_x64_standalone", - ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qd8-f32-qc8w-igemm_sse2-no-sse3_standalone", - ":qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone", - ":qd8-f32-qc8w-igemm_x64_standalone", - ":qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-dwconv_f16c-fma-avx2_standalone", - ":qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-dwconv_sse2-no-sse3_standalone", - ":qs8-dwconv_sse4.1-no-sse4.2_standalone", - ":qs8-dwconv_x64_standalone", - ":qs8-f16-vcvt_f16c-fma-avx2_standalone", - ":qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-f32-vcvt_f16c-fma-avx2_standalone", - ":qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-f32-vcvt_sse2-no-sse3_standalone", - ":qs8-f32-vcvt_sse4.1-no-sse4.2_standalone", - ":qs8-f32-vcvt_x64_standalone", - ":qs8-packw_avx2-avxvnni-f16c-fma_standalone", - ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-packw_x64_standalone", - ":qs8-qc4w-gemm_x64_standalone", - ":qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-qc8w-dwconv_f16c-fma-avx2_standalone", - ":qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-qc8w-dwconv_sse2-no-sse3_standalone", - ":qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-dwconv_x64_standalone", - ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", - ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx2_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-qc8w-gemm_sse2-no-sse3_standalone", - ":qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-gemm_x64_standalone", - ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", - ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx2_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-qc8w-igemm_sse2-no-sse3_standalone", - ":qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-igemm_x64_standalone", - ":qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone", - ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-qu8-packw_x64_standalone", - ":qs8-rdsum_f16c-fma-avx2_standalone", - ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-rdsum_sse4.1-no-sse4.2_standalone", - ":qs8-rdsum_x64_standalone", - ":qs8-rsum_avx2-avxvnni-f16c-fma_standalone", - ":qs8-rsum_f16c-fma-avx2_standalone", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-rsum_ssse3-no-sse4.1_standalone", - ":qs8-rsum_x64_standalone", - ":qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vadd_f16c-fma-avx2_standalone", - ":qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-vadd_sse2-no-sse3_standalone", - ":qs8-vadd_sse4.1-no-sse4.2_standalone", - ":qs8-vadd_x64_standalone", - ":qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vaddc_f16c-fma-avx2_standalone", - ":qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-vaddc_sse2-no-sse3_standalone", - ":qs8-vaddc_sse4.1-no-sse4.2_standalone", - ":qs8-vaddc_x64_standalone", - ":qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vcvt_f16c-fma-avx2_standalone", - ":qs8-vcvt_sse2-no-sse3_standalone", - ":qs8-vcvt_sse4.1-no-sse4.2_standalone", - ":qs8-vcvt_ssse3-no-sse4.1_standalone", - ":qs8-vcvt_x64_standalone", - ":qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vlrelu_f16c-fma-avx2_standalone", - ":qs8-vlrelu_sse2-no-sse3_standalone", - ":qs8-vlrelu_sse4.1-no-sse4.2_standalone", - ":qs8-vlrelu_ssse3-no-sse4.1_standalone", - ":qs8-vlrelu_x64_standalone", - ":qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vmul_sse2-no-sse3_standalone", - ":qs8-vmul_sse4.1-no-sse4.2_standalone", - ":qs8-vmul_x64_standalone", - ":qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone", - ":qs8-vmulc_sse2-no-sse3_standalone", - ":qs8-vmulc_sse4.1-no-sse4.2_standalone", - ":qs8-vmulc_x64_standalone", - ":qs8-vprelu_f16c-fma-avx2_standalone", - ":qs8-vprelu_x64_standalone", - ":qs8-vpreluc_f16c-fma-avx2_standalone", - ":qs8-vpreluc_x64_standalone", - ":qs8-vrpreluc_f16c-fma-avx2_standalone", - ":qs8-vrpreluc_x64_standalone", - ":qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-dwconv_f16c-fma-avx2_standalone", - ":qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-dwconv_sse2-no-sse3_standalone", - ":qu8-dwconv_sse4.1-no-sse4.2_standalone", - ":qu8-dwconv_x64_standalone", - ":qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-f32-vcvt_f16c-fma-avx2_standalone", - ":qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-f32-vcvt_sse2-no-sse3_standalone", - ":qu8-f32-vcvt_sse4.1-no-sse4.2_standalone", - ":qu8-f32-vcvt_x64_standalone", - ":qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-gemm_f16c-fma-avx2_standalone", - ":qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-gemm_sse2-no-sse3_standalone", - ":qu8-gemm_sse4.1-no-sse4.2_standalone", - ":qu8-gemm_x64_standalone", - ":qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-igemm_f16c-fma-avx2_standalone", - ":qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-igemm_sse2-no-sse3_standalone", - ":qu8-igemm_sse4.1-no-sse4.2_standalone", - ":qu8-igemm_x64_standalone", - ":qu8-rdsum_ssse3-no-sse4.1_standalone", - ":qu8-rdsum_x64_standalone", - ":qu8-rsum_f16c-fma-avx2_standalone", - ":qu8-rsum_sse2-no-sse3_standalone", - ":qu8-rsum_x64_standalone", - ":qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vadd_f16c-fma-avx2_standalone", - ":qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-vadd_sse2-no-sse3_standalone", - ":qu8-vadd_sse4.1-no-sse4.2_standalone", - ":qu8-vadd_x64_standalone", - ":qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vaddc_f16c-fma-avx2_standalone", - ":qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qu8-vaddc_sse2-no-sse3_standalone", - ":qu8-vaddc_sse4.1-no-sse4.2_standalone", - ":qu8-vaddc_x64_standalone", - ":qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vcvt_f16c-fma-avx2_standalone", - ":qu8-vcvt_sse2-no-sse3_standalone", - ":qu8-vcvt_sse4.1-no-sse4.2_standalone", - ":qu8-vcvt_ssse3-no-sse4.1_standalone", - ":qu8-vcvt_x64_standalone", - ":qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vlrelu_f16c-fma-avx2_standalone", - ":qu8-vlrelu_sse2-no-sse3_standalone", - ":qu8-vlrelu_sse4.1-no-sse4.2_standalone", - ":qu8-vlrelu_ssse3-no-sse4.1_standalone", - ":qu8-vlrelu_x64_standalone", - ":qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vmul_sse2-no-sse3_standalone", - ":qu8-vmul_sse4.1-no-sse4.2_standalone", - ":qu8-vmul_x64_standalone", - ":qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone", - ":qu8-vmulc_sse2-no-sse3_standalone", - ":qu8-vmulc_sse4.1-no-sse4.2_standalone", - ":qu8-vmulc_x64_standalone", - ":qu8-vprelu_f16c-fma-avx2_standalone", - ":qu8-vprelu_x64_standalone", - ":qu8-vpreluc_f16c-fma-avx2_standalone", - ":qu8-vpreluc_x64_standalone", - ":qu8-vrpreluc_f16c-fma-avx2_standalone", - ":qu8-vrpreluc_x64_standalone", - ":reference_x64_standalone", - ":s8-ibilinear_sse2-no-sse3_standalone", - ":s8-ibilinear_sse4.1-no-sse4.2_standalone", - ":s8-ibilinear_x64_standalone", - ":s8-maxpool_sse4.1-no-sse4.2_standalone", - ":s8-maxpool_x64_standalone", - ":s8-rdminmax_sse4.1-no-sse4.2_standalone", - ":s8-rdminmax_x64_standalone", - ":s8-rminmax_sse4.1-no-sse4.2_standalone", - ":s8-rminmax_x64_standalone", - ":s8-vclamp_f16c-fma-avx2_standalone", - ":s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":s8-vclamp_sse2-no-sse3_standalone", - ":s8-vclamp_sse4.1-no-sse4.2_standalone", - ":s8-vclamp_x64_standalone", - ":subgraph_x64_standalone", - ":tables_x64_standalone", - ":u8-ibilinear_sse2-no-sse3_standalone", - ":u8-ibilinear_sse4.1-no-sse4.2_standalone", - ":u8-ibilinear_x64_standalone", - ":u8-lut32norm_x64_standalone", - ":u8-maxpool_sse2-no-sse3_standalone", - ":u8-maxpool_x64_standalone", - ":u8-rdminmax_sse2-no-sse3_standalone", - ":u8-rdminmax_x64_standalone", - ":u8-rminmax_sse2-no-sse3_standalone", - ":u8-rminmax_x64_standalone", - ":u8-vclamp_f16c-fma-avx2_standalone", - ":u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":u8-vclamp_sse2-no-sse3_standalone", - ":u8-vclamp_x64_standalone", - ":x16-packw_f16c-fma-avx2_standalone", - ":x16-transposec_f16c-fma-avx2_standalone", - ":x16-transposec_sse2-no-sse3_standalone", - ":x16-transposec_x64_standalone", - ":x16-x32-packw_x64_standalone", - ":x24-transposec_ssse3-no-sse4.1_standalone", - ":x24-transposec_x64_standalone", - ":x32-packw_avx-no-avx2-no-f16c-no-fma_standalone", - ":x32-packw_avx512f_standalone", - ":x32-packw_sse2-no-sse3_standalone", - ":x32-packw_x64_standalone", - ":x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone", - ":x32-transposec_sse-no-sse2_standalone", - ":x32-transposec_x64_standalone", - ":x32-unpool_sse2-no-sse3_standalone", - ":x32-unpool_x64_standalone", - ":x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone", - ":x64-transposec_sse2-no-sse3_standalone", - ":x64-transposec_x64_standalone", - ":x8-lut_avx-no-avx2-no-f16c-no-fma_standalone", - ":x8-lut_f16c-fma-avx2_standalone", - ":x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone", - ":x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":x8-lut_x64_standalone", - ":x8-packq_x64_standalone", - ":x8-packw_x64_standalone", - ":x8-transposec_f16c-fma-avx2_standalone", - ":x8-transposec_sse2-no-sse3_standalone", - ":x8-transposec_x64_standalone", - ":xx-copy_x64_standalone", - ":xx-fill_sse2-no-sse3_standalone", - ":xx-fill_x64_standalone", - ":xx-pad_sse2-no-sse3_standalone", - ":xx-pad_x64_standalone", - ":xx-transposev_x64_standalone", - ] + if (build_with_internal_optimization_guide) { + xnnpack_standalone_deps = [ + ":configs_x64_standalone", + ":enums_x64_standalone", + ":f16-avgpool_f16c-no-avx2-no-fma_standalone", + ":f16-dwconv_f16c-fma-no-avx2_standalone", + ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f16-f32-vcvt_f16c-no-avx2-no-fma_standalone", + ":f16-f32-vcvt_sse2-no-sse3_standalone", + ":f16-f32-vcvt_sse4.1-no-sse4.2_standalone", + ":f16-f32-vcvt_x64_standalone", + ":f16-f32acc-gemm_f16c-fma-avx2_standalone", + ":f16-f32acc-igemm_f16c-fma-avx2_standalone", + ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone", + ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone", + ":f16-ibilinear_f16c-fma-no-avx2_standalone", + ":f16-maxpool_f16c-fma-avx2_standalone", + ":f16-maxpool_sse4.1-no-sse4.2_standalone", + ":f16-qs8-vcvt_x64_standalone", + ":f16-qu8-vcvt_x64_standalone", + ":f16-raddstoreexpminusmax_f16c-fma-avx2_standalone", + ":f16-rdminmax_x64_standalone", + ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone", + ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f16-rminmax_f16c-no-avx2-no-fma_standalone", + ":f16-rminmax_x64_standalone", + ":f16-vapproxgelu_x64_standalone", + ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone", + ":f16-vbinary_f16c-no-avx2-no-fma_standalone", + ":f16-vclamp_f16c-no-avx2-no-fma_standalone", + ":f16-vcos_x64_standalone", + ":f16-velu_f16c-fma-avx2_standalone", + ":f16-vexp_x64_standalone", + ":f16-vgelu_x64_standalone", + ":f16-vhswish_f16c-no-avx2-no-fma_standalone", + ":f16-vlrelu_f16c-no-avx2-no-fma_standalone", + ":f16-vmulcaddc_f16c-fma-no-avx2_standalone", + ":f16-vrnd_f16c-no-avx2-no-fma_standalone", + ":f16-vrsqrt_f16c-no-avx2-no-fma_standalone", + ":f16-vsigmoid_f16c-fma-avx2_standalone", + ":f16-vsin_x64_standalone", + ":f16-vsqrt_f16c-no-avx2-no-fma_standalone", + ":f16-vtanh_f16c-fma-no-avx2_standalone", + ":f16-vtanh_f16c-no-avx2-no-fma_standalone", + ":f16-vunary_f16c-no-avx2-no-fma_standalone", + ":f16-vunary_sse2-no-sse3_standalone", + ":f32-argmaxpool_sse2-no-sse3_standalone", + ":f32-argmaxpool_x64_standalone", + ":f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-avgpool_avx512f_standalone", + ":f32-avgpool_sse2-no-sse3_standalone", + ":f32-avgpool_x64_standalone", + ":f32-conv-hwc2chw_sse-no-sse2_standalone", + ":f32-conv-hwc2chw_x64_standalone", + ":f32-dwconv2d-chw_sse-no-sse2_standalone", + ":f32-dwconv2d-chw_ssse3-no-sse4.1_standalone", + ":f32-dwconv2d-chw_x64_standalone", + ":f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-dwconv_avx512f_standalone", + ":f32-dwconv_f16c-fma-no-avx2_standalone", + ":f32-dwconv_sse-no-sse2_standalone", + ":f32-dwconv_x64_standalone", + ":f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f32-f16-vcvt_f16c-no-avx2-no-fma_standalone", + ":f32-f16-vcvt_sse2-no-sse3_standalone", + ":f32-f16-vcvt_sse4.1-no-sse4.2_standalone", + ":f32-f16-vcvt_x64_standalone", + ":f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-gemm_avx512f_standalone", + ":f32-gemm_f16c-fma-no-avx2_standalone", + ":f32-gemm_sse-no-sse2_standalone", + ":f32-gemm_x64_standalone", + ":f32-ibilinear-chw_sse-no-sse2_standalone", + ":f32-ibilinear-chw_x64_standalone", + ":f32-ibilinear_sse-no-sse2_standalone", + ":f32-ibilinear_x64_standalone", + ":f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-igemm_avx512f_standalone", + ":f32-igemm_f16c-fma-no-avx2_standalone", + ":f32-igemm_sse-no-sse2_standalone", + ":f32-igemm_x64_standalone", + ":f32-maxpool_sse2-no-sse3_standalone", + ":f32-maxpool_x64_standalone", + ":f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-qc4w-gemm_f16c-fma-avx2_standalone", + ":f32-qc4w-gemm_f16c-fma-no-avx2_standalone", + ":f32-qc4w-gemm_sse4.1-no-sse4.2_standalone", + ":f32-qc4w-gemm_x64_standalone", + ":f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-qc8w-gemm_f16c-fma-avx2_standalone", + ":f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f32-qc8w-gemm_f16c-fma-no-avx2_standalone", + ":f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", + ":f32-qc8w-gemm_x64_standalone", + ":f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-qs8-vcvt_f16c-fma-avx2_standalone", + ":f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f32-qs8-vcvt_sse2-no-sse3_standalone", + ":f32-qs8-vcvt_sse4.1-no-sse4.2_standalone", + ":f32-qs8-vcvt_x64_standalone", + ":f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-qu8-vcvt_f16c-fma-avx2_standalone", + ":f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f32-qu8-vcvt_sse2-no-sse3_standalone", + ":f32-qu8-vcvt_x64_standalone", + ":f32-raddstoreexpminusmax_avx512f_standalone", + ":f32-raddstoreexpminusmax_f16c-fma-avx2_standalone", + ":f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":f32-raddstoreexpminusmax_sse2-no-sse3_standalone", + ":f32-raddstoreexpminusmax_x64_standalone", + ":f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-rdminmax_avx512f_standalone", + ":f32-rdminmax_sse2-no-sse3_standalone", + ":f32-rdminmax_x64_standalone", + ":f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-rdsum_avx512f_standalone", + ":f32-rdsum_sse2-no-sse3_standalone", + ":f32-rdsum_x64_standalone", + ":f32-rminmax_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-rminmax_avx512f_standalone", + ":f32-rminmax_sse-no-sse2_standalone", + ":f32-rminmax_x64_standalone", + ":f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-rsum_avx512f_standalone", + ":f32-rsum_sse2-no-sse3_standalone", + ":f32-rsum_x64_standalone", + ":f32-spmm_sse-no-sse2_standalone", + ":f32-spmm_x64_standalone", + ":f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vapproxgelu_avx512f_standalone", + ":f32-vapproxgelu_f16c-fma-no-avx2_standalone", + ":f32-vapproxgelu_sse2-no-sse3_standalone", + ":f32-vapproxgelu_x64_standalone", + ":f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vbinary_avx512f_standalone", + ":f32-vbinary_sse-no-sse2_standalone", + ":f32-vbinary_sse2-no-sse3_standalone", + ":f32-vbinary_x64_standalone", + ":f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vclamp_avx512f_standalone", + ":f32-vclamp_sse2-no-sse3_standalone", + ":f32-vclamp_x64_standalone", + ":f32-vcmul_avx512f_standalone", + ":f32-vcmul_f16c-fma-no-avx2_standalone", + ":f32-vcmul_sse-no-sse2_standalone", + ":f32-vcmul_x64_standalone", + ":f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vcopysign_avx512f_standalone", + ":f32-vcopysign_sse2-no-sse3_standalone", + ":f32-vcopysign_x64_standalone", + ":f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vcos_avx512f_standalone", + ":f32-vcos_f16c-fma-no-avx2_standalone", + ":f32-vcos_sse2-no-sse3_standalone", + ":f32-vcos_x64_standalone", + ":f32-velu_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-velu_avx512f_standalone", + ":f32-velu_f16c-fma-avx2_standalone", + ":f32-velu_sse2-no-sse3_standalone", + ":f32-velu_x64_standalone", + ":f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vexp_avx512f_standalone", + ":f32-vexp_f16c-fma-no-avx2_standalone", + ":f32-vexp_sse2-no-sse3_standalone", + ":f32-vexp_x64_standalone", + ":f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vgelu_avx512f_standalone", + ":f32-vgelu_f16c-fma-no-avx2_standalone", + ":f32-vgelu_sse2-no-sse3_standalone", + ":f32-vgelu_x64_standalone", + ":f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vhswish_avx512f_standalone", + ":f32-vhswish_f16c-fma-no-avx2_standalone", + ":f32-vhswish_sse2-no-sse3_standalone", + ":f32-vhswish_x64_standalone", + ":f32-vlog_avx512f_standalone", + ":f32-vlog_f16c-fma-avx2_standalone", + ":f32-vlog_f16c-fma-no-avx2_standalone", + ":f32-vlog_sse2-no-sse3_standalone", + ":f32-vlog_x64_standalone", + ":f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vlrelu_avx512f_standalone", + ":f32-vlrelu_sse-no-sse2_standalone", + ":f32-vlrelu_sse4.1-no-sse4.2_standalone", + ":f32-vlrelu_x64_standalone", + ":f32-vmulcaddc_sse-no-sse2_standalone", + ":f32-vmulcaddc_x64_standalone", + ":f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vrnd_avx512f_standalone", + ":f32-vrnd_sse2-no-sse3_standalone", + ":f32-vrnd_sse4.1-no-sse4.2_standalone", + ":f32-vrnd_x64_standalone", + ":f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vrsqrt_avx512f_standalone", + ":f32-vrsqrt_sse2-no-sse3_standalone", + ":f32-vrsqrt_x64_standalone", + ":f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vsigmoid_avx512f_standalone", + ":f32-vsigmoid_f16c-fma-avx2_standalone", + ":f32-vsigmoid_sse2-no-sse3_standalone", + ":f32-vsigmoid_sse4.1-no-sse4.2_standalone", + ":f32-vsigmoid_x64_standalone", + ":f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vsin_avx512f_standalone", + ":f32-vsin_f16c-fma-no-avx2_standalone", + ":f32-vsin_sse2-no-sse3_standalone", + ":f32-vsin_x64_standalone", + ":f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vsqrt_avx512f_standalone", + ":f32-vsqrt_sse2-no-sse3_standalone", + ":f32-vsqrt_x64_standalone", + ":f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vtanh_avx512f_standalone", + ":f32-vtanh_f16c-fma-no-avx2_standalone", + ":f32-vtanh_sse2-no-sse3_standalone", + ":f32-vtanh_x64_standalone", + ":f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone", + ":f32-vunary_avx512f_standalone", + ":f32-vunary_sse2-no-sse3_standalone", + ":f32-vunary_x64_standalone", + ":operators_x64_standalone", + ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone", + ":qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f32-qb4w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone", + ":qd8-f32-qb4w-gemm_x64_standalone", + ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc4w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone", + ":qd8-f32-qc4w-gemm_x64_standalone", + ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc8w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", + ":qd8-f32-qc8w-gemm_x64_standalone", + ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc8w-igemm_sse2-no-sse3_standalone", + ":qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone", + ":qd8-f32-qc8w-igemm_x64_standalone", + ":qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-dwconv_f16c-fma-avx2_standalone", + ":qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-dwconv_sse2-no-sse3_standalone", + ":qs8-dwconv_sse4.1-no-sse4.2_standalone", + ":qs8-dwconv_x64_standalone", + ":qs8-f16-vcvt_f16c-fma-avx2_standalone", + ":qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-f32-vcvt_f16c-fma-avx2_standalone", + ":qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-f32-vcvt_sse2-no-sse3_standalone", + ":qs8-f32-vcvt_sse4.1-no-sse4.2_standalone", + ":qs8-f32-vcvt_x64_standalone", + ":qs8-packw_avx2-avxvnni-f16c-fma_standalone", + ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-packw_x64_standalone", + ":qs8-qc4w-gemm_x64_standalone", + ":qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-qc8w-dwconv_f16c-fma-avx2_standalone", + ":qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc8w-dwconv_sse2-no-sse3_standalone", + ":qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-dwconv_x64_standalone", + ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", + ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx2_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc8w-gemm_sse2-no-sse3_standalone", + ":qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-gemm_x64_standalone", + ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", + ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx2_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc8w-igemm_sse2-no-sse3_standalone", + ":qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-igemm_x64_standalone", + ":qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone", + ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-qu8-packw_x64_standalone", + ":qs8-rdsum_f16c-fma-avx2_standalone", + ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-rdsum_sse4.1-no-sse4.2_standalone", + ":qs8-rdsum_x64_standalone", + ":qs8-rsum_avx2-avxvnni-f16c-fma_standalone", + ":qs8-rsum_f16c-fma-avx2_standalone", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-rsum_ssse3-no-sse4.1_standalone", + ":qs8-rsum_x64_standalone", + ":qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vadd_f16c-fma-avx2_standalone", + ":qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-vadd_sse2-no-sse3_standalone", + ":qs8-vadd_sse4.1-no-sse4.2_standalone", + ":qs8-vadd_x64_standalone", + ":qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vaddc_f16c-fma-avx2_standalone", + ":qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-vaddc_sse2-no-sse3_standalone", + ":qs8-vaddc_sse4.1-no-sse4.2_standalone", + ":qs8-vaddc_x64_standalone", + ":qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vcvt_f16c-fma-avx2_standalone", + ":qs8-vcvt_sse2-no-sse3_standalone", + ":qs8-vcvt_sse4.1-no-sse4.2_standalone", + ":qs8-vcvt_ssse3-no-sse4.1_standalone", + ":qs8-vcvt_x64_standalone", + ":qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vlrelu_f16c-fma-avx2_standalone", + ":qs8-vlrelu_sse2-no-sse3_standalone", + ":qs8-vlrelu_sse4.1-no-sse4.2_standalone", + ":qs8-vlrelu_ssse3-no-sse4.1_standalone", + ":qs8-vlrelu_x64_standalone", + ":qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vmul_sse2-no-sse3_standalone", + ":qs8-vmul_sse4.1-no-sse4.2_standalone", + ":qs8-vmul_x64_standalone", + ":qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone", + ":qs8-vmulc_sse2-no-sse3_standalone", + ":qs8-vmulc_sse4.1-no-sse4.2_standalone", + ":qs8-vmulc_x64_standalone", + ":qs8-vprelu_f16c-fma-avx2_standalone", + ":qs8-vprelu_x64_standalone", + ":qs8-vpreluc_f16c-fma-avx2_standalone", + ":qs8-vpreluc_x64_standalone", + ":qs8-vrpreluc_f16c-fma-avx2_standalone", + ":qs8-vrpreluc_x64_standalone", + ":qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-dwconv_f16c-fma-avx2_standalone", + ":qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-dwconv_sse2-no-sse3_standalone", + ":qu8-dwconv_sse4.1-no-sse4.2_standalone", + ":qu8-dwconv_x64_standalone", + ":qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-f32-vcvt_f16c-fma-avx2_standalone", + ":qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-f32-vcvt_sse2-no-sse3_standalone", + ":qu8-f32-vcvt_sse4.1-no-sse4.2_standalone", + ":qu8-f32-vcvt_x64_standalone", + ":qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-gemm_f16c-fma-avx2_standalone", + ":qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-gemm_sse2-no-sse3_standalone", + ":qu8-gemm_sse4.1-no-sse4.2_standalone", + ":qu8-gemm_x64_standalone", + ":qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-igemm_f16c-fma-avx2_standalone", + ":qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-igemm_sse2-no-sse3_standalone", + ":qu8-igemm_sse4.1-no-sse4.2_standalone", + ":qu8-igemm_x64_standalone", + ":qu8-rdsum_ssse3-no-sse4.1_standalone", + ":qu8-rdsum_x64_standalone", + ":qu8-rsum_f16c-fma-avx2_standalone", + ":qu8-rsum_sse2-no-sse3_standalone", + ":qu8-rsum_x64_standalone", + ":qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vadd_f16c-fma-avx2_standalone", + ":qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-vadd_sse2-no-sse3_standalone", + ":qu8-vadd_sse4.1-no-sse4.2_standalone", + ":qu8-vadd_x64_standalone", + ":qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vaddc_f16c-fma-avx2_standalone", + ":qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qu8-vaddc_sse2-no-sse3_standalone", + ":qu8-vaddc_sse4.1-no-sse4.2_standalone", + ":qu8-vaddc_x64_standalone", + ":qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vcvt_f16c-fma-avx2_standalone", + ":qu8-vcvt_sse2-no-sse3_standalone", + ":qu8-vcvt_sse4.1-no-sse4.2_standalone", + ":qu8-vcvt_ssse3-no-sse4.1_standalone", + ":qu8-vcvt_x64_standalone", + ":qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vlrelu_f16c-fma-avx2_standalone", + ":qu8-vlrelu_sse2-no-sse3_standalone", + ":qu8-vlrelu_sse4.1-no-sse4.2_standalone", + ":qu8-vlrelu_ssse3-no-sse4.1_standalone", + ":qu8-vlrelu_x64_standalone", + ":qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vmul_sse2-no-sse3_standalone", + ":qu8-vmul_sse4.1-no-sse4.2_standalone", + ":qu8-vmul_x64_standalone", + ":qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone", + ":qu8-vmulc_sse2-no-sse3_standalone", + ":qu8-vmulc_sse4.1-no-sse4.2_standalone", + ":qu8-vmulc_x64_standalone", + ":qu8-vprelu_f16c-fma-avx2_standalone", + ":qu8-vprelu_x64_standalone", + ":qu8-vpreluc_f16c-fma-avx2_standalone", + ":qu8-vpreluc_x64_standalone", + ":qu8-vrpreluc_f16c-fma-avx2_standalone", + ":qu8-vrpreluc_x64_standalone", + ":reference_x64_standalone", + ":s8-ibilinear_sse2-no-sse3_standalone", + ":s8-ibilinear_sse4.1-no-sse4.2_standalone", + ":s8-ibilinear_x64_standalone", + ":s8-maxpool_sse4.1-no-sse4.2_standalone", + ":s8-maxpool_x64_standalone", + ":s8-rdminmax_sse4.1-no-sse4.2_standalone", + ":s8-rdminmax_x64_standalone", + ":s8-rminmax_sse4.1-no-sse4.2_standalone", + ":s8-rminmax_x64_standalone", + ":s8-vclamp_f16c-fma-avx2_standalone", + ":s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":s8-vclamp_sse2-no-sse3_standalone", + ":s8-vclamp_sse4.1-no-sse4.2_standalone", + ":s8-vclamp_x64_standalone", + ":subgraph_x64_standalone", + ":tables_x64_standalone", + ":u8-ibilinear_sse2-no-sse3_standalone", + ":u8-ibilinear_sse4.1-no-sse4.2_standalone", + ":u8-ibilinear_x64_standalone", + ":u8-lut32norm_x64_standalone", + ":u8-maxpool_sse2-no-sse3_standalone", + ":u8-maxpool_x64_standalone", + ":u8-rdminmax_sse2-no-sse3_standalone", + ":u8-rdminmax_x64_standalone", + ":u8-rminmax_sse2-no-sse3_standalone", + ":u8-rminmax_x64_standalone", + ":u8-vclamp_f16c-fma-avx2_standalone", + ":u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":u8-vclamp_sse2-no-sse3_standalone", + ":u8-vclamp_x64_standalone", + ":x16-packw_f16c-fma-avx2_standalone", + ":x16-transposec_f16c-fma-avx2_standalone", + ":x16-transposec_sse2-no-sse3_standalone", + ":x16-transposec_x64_standalone", + ":x16-x32-packw_x64_standalone", + ":x24-transposec_ssse3-no-sse4.1_standalone", + ":x24-transposec_x64_standalone", + ":x32-packw_avx-no-avx2-no-f16c-no-fma_standalone", + ":x32-packw_avx512f_standalone", + ":x32-packw_sse2-no-sse3_standalone", + ":x32-packw_x64_standalone", + ":x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone", + ":x32-transposec_sse-no-sse2_standalone", + ":x32-transposec_x64_standalone", + ":x32-unpool_sse2-no-sse3_standalone", + ":x32-unpool_x64_standalone", + ":x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone", + ":x64-transposec_sse2-no-sse3_standalone", + ":x64-transposec_x64_standalone", + ":x8-lut_avx-no-avx2-no-f16c-no-fma_standalone", + ":x8-lut_f16c-fma-avx2_standalone", + ":x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone", + ":x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":x8-lut_x64_standalone", + ":x8-packq_x64_standalone", + ":x8-packw_x64_standalone", + ":x8-transposec_f16c-fma-avx2_standalone", + ":x8-transposec_sse2-no-sse3_standalone", + ":x8-transposec_x64_standalone", + ":xx-copy_x64_standalone", + ":xx-fill_sse2-no-sse3_standalone", + ":xx-fill_x64_standalone", + ":xx-pad_sse2-no-sse3_standalone", + ":xx-pad_x64_standalone", + ":xx-transposev_x64_standalone", + ] + } } else if (current_cpu == "arm64") { xnnpack_deps = [ ":configs_arm64", @@ -1252,212 +1255,214 @@ ":xx-transposev_arm64", ] - xnnpack_standalone_deps = [ - ":configs_arm64_standalone", - ":enums_arm64_standalone", - ":f16-avgpool_arch=armv8.2-a+fp16_standalone", - ":f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone", - ":f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone", - ":f16-dwconv_arch=armv8.2-a+fp16_standalone", - ":f16-f32-vcvt_arm64_standalone", - ":f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone", - ":f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone", - ":f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":f16-gemm_arch=armv8.2-a+fp16_standalone", - ":f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone", - ":f16-ibilinear_arch=armv8.2-a+fp16_standalone", - ":f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":f16-igemm_arch=armv8.2-a+fp16_standalone", - ":f16-maxpool_arch=armv8.2-a+fp16_standalone", - ":f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone", - ":f16-qs8-vcvt_arm64_standalone", - ":f16-qu8-vcvt_arm64_standalone", - ":f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone", - ":f16-rdminmax_arch=armv8.2-a+fp16_standalone", - ":f16-rdminmax_arm64_standalone", - ":f16-rminmax_arch=armv8.2-a+fp16_standalone", - ":f16-rminmax_arm64_standalone", - ":f16-spmm_arch=armv8.2-a+fp16_standalone", - ":f16-vapproxgelu_arch=armv8.2-a+fp16_standalone", - ":f16-vapproxgelu_arm64_standalone", - ":f16-vbinary_arch=armv8.2-a+fp16_standalone", - ":f16-vclamp_arch=armv8.2-a+fp16_standalone", - ":f16-vcmul_arch=armv8.2-a+fp16_standalone", - ":f16-vcos_arch=armv8.2-a+fp16_standalone", - ":f16-vcos_arm64_standalone", - ":f16-velu_arch=armv8.2-a+fp16_standalone", - ":f16-vexp_arch=armv8.2-a+fp16_standalone", - ":f16-vexp_arm64_standalone", - ":f16-vgelu_arch=armv8.2-a+fp16_standalone", - ":f16-vgelu_arm64_standalone", - ":f16-vhswish_arch=armv8.2-a+fp16_standalone", - ":f16-vlrelu_arch=armv8.2-a+fp16_standalone", - ":f16-vmulcaddc_arch=armv8.2-a+fp16_standalone", - ":f16-vrnd_arch=armv8.2-a+fp16_standalone", - ":f16-vrsqrt_arch=armv8.2-a+fp16_standalone", - ":f16-vsigmoid_arch=armv8.2-a+fp16_standalone", - ":f16-vsin_arch=armv8.2-a+fp16_standalone", - ":f16-vsin_arm64_standalone", - ":f16-vsqrt_arch=armv8.2-a+fp16_standalone", - ":f16-vtanh_arch=armv8.2-a+fp16_standalone", - ":f16-vunary_arch=armv8.2-a+fp16_standalone", - ":f32-argmaxpool_arm64_standalone", - ":f32-avgpool_arm64_standalone", - ":f32-conv-hwc2chw_arm64_standalone", - ":f32-dwconv2d-chw_arm64_standalone", - ":f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone", - ":f32-dwconv_arm64_standalone", - ":f32-f16-vcvt_arm64_standalone", - ":f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":f32-gemm_arm64_standalone", - ":f32-ibilinear-chw_arm64_standalone", - ":f32-ibilinear_arm64_standalone", - ":f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":f32-igemm_arm64_standalone", - ":f32-maxpool_arm64_standalone", - ":f32-qc4w-gemm_arm64_standalone", - ":f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":f32-qc8w-gemm_arm64_standalone", - ":f32-qs8-vcvt_arm64_standalone", - ":f32-qu8-vcvt_arm64_standalone", - ":f32-raddstoreexpminusmax_arm64_standalone", - ":f32-rdminmax_arm64_standalone", - ":f32-rdsum_arm64_standalone", - ":f32-rminmax_arm64_standalone", - ":f32-rsum_arm64_standalone", - ":f32-spmm_arm64_standalone", - ":f32-vapproxgelu_arm64_standalone", - ":f32-vbinary_arm64_standalone", - ":f32-vclamp_arm64_standalone", - ":f32-vcmul_arm64_standalone", - ":f32-vcopysign_arm64_standalone", - ":f32-vcos_arm64_standalone", - ":f32-velu_arm64_standalone", - ":f32-vexp_arm64_standalone", - ":f32-vgelu_arm64_standalone", - ":f32-vhswish_arm64_standalone", - ":f32-vlog_arm64_standalone", - ":f32-vlrelu_arm64_standalone", - ":f32-vmulcaddc_arm64_standalone", - ":f32-vrnd_arm64_standalone", - ":f32-vrsqrt_arm64_standalone", - ":f32-vsigmoid_arm64_standalone", - ":f32-vsin_arm64_standalone", - ":f32-vsqrt_arm64_standalone", - ":f32-vtanh_arm64_standalone", - ":f32-vunary_arm64_standalone", - ":operators_arm64_standalone", - ":qb4-packw_arch=armv8.2-a+dotprod_standalone", - ":qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", - ":qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone", - ":qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", - ":qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone", - ":qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", - ":qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone", - ":qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone", - ":qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone", - ":qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qb4w-gemm_arm64_standalone", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qc4w-gemm_arm64_standalone", - ":qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qc8w-gemm_arm64_standalone", - ":qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qc8w-igemm_arm64_standalone", - ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qs8-dwconv_arm64_standalone", - ":qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone", - ":qs8-f32-vcvt_arm64_standalone", - ":qs8-packw_arm64_standalone", - ":qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qs8-qc4w-gemm_arm64_standalone", - ":qs8-qc8w-dwconv_arm64_standalone", - ":qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qs8-qc8w-gemm_arm64_standalone", - ":qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone", - ":qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qs8-qc8w-igemm_arm64_standalone", - ":qs8-qu8-packw_arm64_standalone", - ":qs8-rdsum_arm64_standalone", - ":qs8-rsum_arch=armv8.2-a+dotprod_standalone", - ":qs8-rsum_arm64_standalone", - ":qs8-vadd_arm64_standalone", - ":qs8-vaddc_arm64_standalone", - ":qs8-vcvt_arm64_standalone", - ":qs8-vlrelu_arm64_standalone", - ":qs8-vmul_arm64_standalone", - ":qs8-vmulc_arm64_standalone", - ":qs8-vprelu_arm64_standalone", - ":qs8-vpreluc_arm64_standalone", - ":qs8-vrpreluc_arm64_standalone", - ":qu8-dwconv_arm64_standalone", - ":qu8-f32-vcvt_arm64_standalone", - ":qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qu8-gemm_arm64_standalone", - ":qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone", - ":qu8-igemm_arm64_standalone", - ":qu8-rdsum_arm64_standalone", - ":qu8-rsum_arm64_standalone", - ":qu8-vadd_arm64_standalone", - ":qu8-vaddc_arm64_standalone", - ":qu8-vcvt_arm64_standalone", - ":qu8-vlrelu_arm64_standalone", - ":qu8-vmul_arm64_standalone", - ":qu8-vmulc_arm64_standalone", - ":qu8-vprelu_arm64_standalone", - ":qu8-vpreluc_arm64_standalone", - ":qu8-vrpreluc_arm64_standalone", - ":reference_arm64_standalone", - ":s8-ibilinear_arm64_standalone", - ":s8-maxpool_arm64_standalone", - ":s8-rdminmax_arm64_standalone", - ":s8-rminmax_arm64_standalone", - ":s8-vclamp_arm64_standalone", - ":subgraph_arm64_standalone", - ":tables_arm64_standalone", - ":u8-ibilinear_arm64_standalone", - ":u8-lut32norm_arm64_standalone", - ":u8-maxpool_arm64_standalone", - ":u8-rdminmax_arm64_standalone", - ":u8-rminmax_arm64_standalone", - ":u8-vclamp_arm64_standalone", - ":x16-packw_arm64_standalone", - ":x16-transposec_arm64_standalone", - ":x16-x32-packw_arm64_standalone", - ":x24-transposec_arm64_standalone", - ":x32-packw_arm64_standalone", - ":x32-transposec_arm64_standalone", - ":x32-unpool_arm64_standalone", - ":x64-transposec_arm64_standalone", - ":x8-lut_arm64_standalone", - ":x8-packq_arm64_standalone", - ":x8-packw_arm64_standalone", - ":x8-transposec_arm64_standalone", - ":xx-copy_arm64_standalone", - ":xx-fill_arm64_standalone", - ":xx-pad_arm64_standalone", - ":xx-transposev_arm64_standalone", - ] + if (build_with_internal_optimization_guide) { + xnnpack_standalone_deps = [ + ":configs_arm64_standalone", + ":enums_arm64_standalone", + ":f16-avgpool_arch=armv8.2-a+fp16_standalone", + ":f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone", + ":f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone", + ":f16-dwconv_arch=armv8.2-a+fp16_standalone", + ":f16-f32-vcvt_arm64_standalone", + ":f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone", + ":f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone", + ":f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":f16-gemm_arch=armv8.2-a+fp16_standalone", + ":f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone", + ":f16-ibilinear_arch=armv8.2-a+fp16_standalone", + ":f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":f16-igemm_arch=armv8.2-a+fp16_standalone", + ":f16-maxpool_arch=armv8.2-a+fp16_standalone", + ":f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone", + ":f16-qs8-vcvt_arm64_standalone", + ":f16-qu8-vcvt_arm64_standalone", + ":f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone", + ":f16-rdminmax_arch=armv8.2-a+fp16_standalone", + ":f16-rdminmax_arm64_standalone", + ":f16-rminmax_arch=armv8.2-a+fp16_standalone", + ":f16-rminmax_arm64_standalone", + ":f16-spmm_arch=armv8.2-a+fp16_standalone", + ":f16-vapproxgelu_arch=armv8.2-a+fp16_standalone", + ":f16-vapproxgelu_arm64_standalone", + ":f16-vbinary_arch=armv8.2-a+fp16_standalone", + ":f16-vclamp_arch=armv8.2-a+fp16_standalone", + ":f16-vcmul_arch=armv8.2-a+fp16_standalone", + ":f16-vcos_arch=armv8.2-a+fp16_standalone", + ":f16-vcos_arm64_standalone", + ":f16-velu_arch=armv8.2-a+fp16_standalone", + ":f16-vexp_arch=armv8.2-a+fp16_standalone", + ":f16-vexp_arm64_standalone", + ":f16-vgelu_arch=armv8.2-a+fp16_standalone", + ":f16-vgelu_arm64_standalone", + ":f16-vhswish_arch=armv8.2-a+fp16_standalone", + ":f16-vlrelu_arch=armv8.2-a+fp16_standalone", + ":f16-vmulcaddc_arch=armv8.2-a+fp16_standalone", + ":f16-vrnd_arch=armv8.2-a+fp16_standalone", + ":f16-vrsqrt_arch=armv8.2-a+fp16_standalone", + ":f16-vsigmoid_arch=armv8.2-a+fp16_standalone", + ":f16-vsin_arch=armv8.2-a+fp16_standalone", + ":f16-vsin_arm64_standalone", + ":f16-vsqrt_arch=armv8.2-a+fp16_standalone", + ":f16-vtanh_arch=armv8.2-a+fp16_standalone", + ":f16-vunary_arch=armv8.2-a+fp16_standalone", + ":f32-argmaxpool_arm64_standalone", + ":f32-avgpool_arm64_standalone", + ":f32-conv-hwc2chw_arm64_standalone", + ":f32-dwconv2d-chw_arm64_standalone", + ":f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone", + ":f32-dwconv_arm64_standalone", + ":f32-f16-vcvt_arm64_standalone", + ":f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":f32-gemm_arm64_standalone", + ":f32-ibilinear-chw_arm64_standalone", + ":f32-ibilinear_arm64_standalone", + ":f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":f32-igemm_arm64_standalone", + ":f32-maxpool_arm64_standalone", + ":f32-qc4w-gemm_arm64_standalone", + ":f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":f32-qc8w-gemm_arm64_standalone", + ":f32-qs8-vcvt_arm64_standalone", + ":f32-qu8-vcvt_arm64_standalone", + ":f32-raddstoreexpminusmax_arm64_standalone", + ":f32-rdminmax_arm64_standalone", + ":f32-rdsum_arm64_standalone", + ":f32-rminmax_arm64_standalone", + ":f32-rsum_arm64_standalone", + ":f32-spmm_arm64_standalone", + ":f32-vapproxgelu_arm64_standalone", + ":f32-vbinary_arm64_standalone", + ":f32-vclamp_arm64_standalone", + ":f32-vcmul_arm64_standalone", + ":f32-vcopysign_arm64_standalone", + ":f32-vcos_arm64_standalone", + ":f32-velu_arm64_standalone", + ":f32-vexp_arm64_standalone", + ":f32-vgelu_arm64_standalone", + ":f32-vhswish_arm64_standalone", + ":f32-vlog_arm64_standalone", + ":f32-vlrelu_arm64_standalone", + ":f32-vmulcaddc_arm64_standalone", + ":f32-vrnd_arm64_standalone", + ":f32-vrsqrt_arm64_standalone", + ":f32-vsigmoid_arm64_standalone", + ":f32-vsin_arm64_standalone", + ":f32-vsqrt_arm64_standalone", + ":f32-vtanh_arm64_standalone", + ":f32-vunary_arm64_standalone", + ":operators_arm64_standalone", + ":qb4-packw_arch=armv8.2-a+dotprod_standalone", + ":qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", + ":qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone", + ":qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", + ":qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone", + ":qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone", + ":qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone", + ":qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone", + ":qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone", + ":qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qb4w-gemm_arm64_standalone", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qc4w-gemm_arm64_standalone", + ":qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qc8w-gemm_arm64_standalone", + ":qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qc8w-igemm_arm64_standalone", + ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qs8-dwconv_arm64_standalone", + ":qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone", + ":qs8-f32-vcvt_arm64_standalone", + ":qs8-packw_arm64_standalone", + ":qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qs8-qc4w-gemm_arm64_standalone", + ":qs8-qc8w-dwconv_arm64_standalone", + ":qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qs8-qc8w-gemm_arm64_standalone", + ":qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone", + ":qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qs8-qc8w-igemm_arm64_standalone", + ":qs8-qu8-packw_arm64_standalone", + ":qs8-rdsum_arm64_standalone", + ":qs8-rsum_arch=armv8.2-a+dotprod_standalone", + ":qs8-rsum_arm64_standalone", + ":qs8-vadd_arm64_standalone", + ":qs8-vaddc_arm64_standalone", + ":qs8-vcvt_arm64_standalone", + ":qs8-vlrelu_arm64_standalone", + ":qs8-vmul_arm64_standalone", + ":qs8-vmulc_arm64_standalone", + ":qs8-vprelu_arm64_standalone", + ":qs8-vpreluc_arm64_standalone", + ":qs8-vrpreluc_arm64_standalone", + ":qu8-dwconv_arm64_standalone", + ":qu8-f32-vcvt_arm64_standalone", + ":qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qu8-gemm_arm64_standalone", + ":qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone", + ":qu8-igemm_arm64_standalone", + ":qu8-rdsum_arm64_standalone", + ":qu8-rsum_arm64_standalone", + ":qu8-vadd_arm64_standalone", + ":qu8-vaddc_arm64_standalone", + ":qu8-vcvt_arm64_standalone", + ":qu8-vlrelu_arm64_standalone", + ":qu8-vmul_arm64_standalone", + ":qu8-vmulc_arm64_standalone", + ":qu8-vprelu_arm64_standalone", + ":qu8-vpreluc_arm64_standalone", + ":qu8-vrpreluc_arm64_standalone", + ":reference_arm64_standalone", + ":s8-ibilinear_arm64_standalone", + ":s8-maxpool_arm64_standalone", + ":s8-rdminmax_arm64_standalone", + ":s8-rminmax_arm64_standalone", + ":s8-vclamp_arm64_standalone", + ":subgraph_arm64_standalone", + ":tables_arm64_standalone", + ":u8-ibilinear_arm64_standalone", + ":u8-lut32norm_arm64_standalone", + ":u8-maxpool_arm64_standalone", + ":u8-rdminmax_arm64_standalone", + ":u8-rminmax_arm64_standalone", + ":u8-vclamp_arm64_standalone", + ":x16-packw_arm64_standalone", + ":x16-transposec_arm64_standalone", + ":x16-x32-packw_arm64_standalone", + ":x24-transposec_arm64_standalone", + ":x32-packw_arm64_standalone", + ":x32-transposec_arm64_standalone", + ":x32-unpool_arm64_standalone", + ":x64-transposec_arm64_standalone", + ":x8-lut_arm64_standalone", + ":x8-packq_arm64_standalone", + ":x8-packw_arm64_standalone", + ":x8-transposec_arm64_standalone", + ":xx-copy_arm64_standalone", + ":xx-fill_arm64_standalone", + ":xx-pad_arm64_standalone", + ":xx-transposev_arm64_standalone", + ] + } } else if (current_cpu == "riscv64") { xnnpack_deps = [ ":configs_riscv64", @@ -1630,179 +1635,183 @@ ":xx-transposev_riscv64", ] - xnnpack_standalone_deps = [ - ":configs_riscv64_standalone", - ":enums_riscv64_standalone", - ":f16-f32-vcvt_riscv64_standalone", - ":f16-qs8-vcvt_riscv64_standalone", - ":f16-qu8-vcvt_riscv64_standalone", - ":f16-rdminmax_riscv64_standalone", - ":f16-rminmax_riscv64_standalone", - ":f16-vapproxgelu_riscv64_standalone", - ":f16-vcos_riscv64_standalone", - ":f16-vexp_riscv64_standalone", - ":f16-vgelu_riscv64_standalone", - ":f16-vsin_riscv64_standalone", - ":f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone", - ":f32-argmaxpool_riscv64_standalone", - ":f32-avgpool_riscv64_standalone", - ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone", - ":f32-conv-hwc2chw_riscv64_standalone", - ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone", - ":f32-dwconv2d-chw_riscv64_standalone", - ":f32-dwconv_arch=rv64gcv-abi=lp64d_standalone", - ":f32-dwconv_riscv64_standalone", - ":f32-f16-vcvt_riscv64_standalone", - ":f32-gemm_arch=rv64gcv-abi=lp64d_standalone", - ":f32-gemm_riscv64_standalone", - ":f32-ibilinear-chw_riscv64_standalone", - ":f32-ibilinear_riscv64_standalone", - ":f32-igemm_arch=rv64gcv-abi=lp64d_standalone", - ":f32-igemm_riscv64_standalone", - ":f32-maxpool_arch=rv64gcv-abi=lp64d_standalone", - ":f32-maxpool_riscv64_standalone", - ":f32-qc4w-gemm_riscv64_standalone", - ":f32-qc8w-gemm_riscv64_standalone", - ":f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone", - ":f32-qs8-vcvt_riscv64_standalone", - ":f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone", - ":f32-qu8-vcvt_riscv64_standalone", - ":f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone", - ":f32-raddstoreexpminusmax_riscv64_standalone", - ":f32-rdminmax_riscv64_standalone", - ":f32-rdsum_arch=rv64gcv-abi=lp64d_standalone", - ":f32-rdsum_riscv64_standalone", - ":f32-rminmax_arch=rv64gcv-abi=lp64d_standalone", - ":f32-rminmax_riscv64_standalone", - ":f32-rsum_riscv64_standalone", - ":f32-spmm_arch=rv64gcv-abi=lp64d_standalone", - ":f32-spmm_riscv64_standalone", - ":f32-vapproxgelu_riscv64_standalone", - ":f32-vbinary_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vbinary_riscv64_standalone", - ":f32-vclamp_riscv64_standalone", - ":f32-vcmul_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vcmul_riscv64_standalone", - ":f32-vcopysign_riscv64_standalone", - ":f32-vcos_riscv64_standalone", - ":f32-velu_riscv64_standalone", - ":f32-vexp_riscv64_standalone", - ":f32-vgelu_riscv64_standalone", - ":f32-vhswish_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vhswish_riscv64_standalone", - ":f32-vlog_riscv64_standalone", - ":f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vlrelu_riscv64_standalone", - ":f32-vmulcaddc_riscv64_standalone", - ":f32-vrnd_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vrnd_riscv64_standalone", - ":f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone", - ":f32-vrsqrt_riscv64_standalone", - ":f32-vsigmoid_riscv64_standalone", - ":f32-vsin_riscv64_standalone", - ":f32-vsqrt_riscv64_standalone", - ":f32-vtanh_riscv64_standalone", - ":f32-vunary_riscv64_standalone", - ":operators_riscv64_standalone", - ":qd8-f32-qb4w-gemm_riscv64_standalone", - ":qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone", - ":qd8-f32-qc4w-gemm_riscv64_standalone", - ":qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone", - ":qd8-f32-qc8w-gemm_riscv64_standalone", - ":qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone", - ":qd8-f32-qc8w-igemm_riscv64_standalone", - ":qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-dwconv_riscv64_standalone", - ":qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-f32-vcvt_riscv64_standalone", - ":qs8-packw_riscv64_standalone", - ":qs8-qc4w-gemm_riscv64_standalone", - ":qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-qc8w-dwconv_riscv64_standalone", - ":qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-qc8w-gemm_riscv64_standalone", - ":qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-qc8w-igemm_riscv64_standalone", - ":qs8-qu8-packw_riscv64_standalone", - ":qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-rdsum_riscv64_standalone", - ":qs8-rsum_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-rsum_riscv64_standalone", - ":qs8-vadd_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-vadd_riscv64_standalone", - ":qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-vaddc_riscv64_standalone", - ":qs8-vcvt_riscv64_standalone", - ":qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-vlrelu_riscv64_standalone", - ":qs8-vmul_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-vmul_riscv64_standalone", - ":qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone", - ":qs8-vmulc_riscv64_standalone", - ":qs8-vprelu_riscv64_standalone", - ":qs8-vpreluc_riscv64_standalone", - ":qs8-vrpreluc_riscv64_standalone", - ":qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-dwconv_riscv64_standalone", - ":qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-f32-vcvt_riscv64_standalone", - ":qu8-gemm_riscv64_standalone", - ":qu8-igemm_riscv64_standalone", - ":qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-rdsum_riscv64_standalone", - ":qu8-rsum_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-rsum_riscv64_standalone", - ":qu8-vadd_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-vadd_riscv64_standalone", - ":qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-vaddc_riscv64_standalone", - ":qu8-vcvt_riscv64_standalone", - ":qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-vlrelu_riscv64_standalone", - ":qu8-vmul_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-vmul_riscv64_standalone", - ":qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone", - ":qu8-vmulc_riscv64_standalone", - ":qu8-vprelu_riscv64_standalone", - ":qu8-vpreluc_riscv64_standalone", - ":qu8-vrpreluc_riscv64_standalone", - ":reference_riscv64_standalone", - ":s8-ibilinear_riscv64_standalone", - ":s8-maxpool_riscv64_standalone", - ":s8-rdminmax_riscv64_standalone", - ":s8-rminmax_riscv64_standalone", - ":s8-vclamp_arch=rv64gcv-abi=lp64d_standalone", - ":s8-vclamp_riscv64_standalone", - ":subgraph_riscv64_standalone", - ":tables_riscv64_standalone", - ":u8-ibilinear_riscv64_standalone", - ":u8-lut32norm_riscv64_standalone", - ":u8-maxpool_riscv64_standalone", - ":u8-rdminmax_riscv64_standalone", - ":u8-rminmax_riscv64_standalone", - ":u8-vclamp_arch=rv64gcv-abi=lp64d_standalone", - ":u8-vclamp_riscv64_standalone", - ":x16-transposec_riscv64_standalone", - ":x16-x32-packw_riscv64_standalone", - ":x24-transposec_riscv64_standalone", - ":x32-packw_arch=rv64gcv-abi=lp64d_standalone", - ":x32-packw_riscv64_standalone", - ":x32-transposec_arch=rv64gcv-abi=lp64d_standalone", - ":x32-transposec_riscv64_standalone", - ":x32-unpool_riscv64_standalone", - ":x64-transposec_riscv64_standalone", - ":x8-lut_riscv64_standalone", - ":x8-packq_riscv64_standalone", - ":x8-packw_riscv64_standalone", - ":x8-transposec_riscv64_standalone", - ":xx-copy_riscv64_standalone", - ":xx-fill_riscv64_standalone", - ":xx-pad_riscv64_standalone", - ":xx-transposev_riscv64_standalone", - ] + if (build_with_internal_optimization_guide) { + xnnpack_standalone_deps = [ + ":configs_riscv64_standalone", + ":enums_riscv64_standalone", + ":f16-f32-vcvt_riscv64_standalone", + ":f16-qs8-vcvt_riscv64_standalone", + ":f16-qu8-vcvt_riscv64_standalone", + ":f16-rdminmax_riscv64_standalone", + ":f16-rminmax_riscv64_standalone", + ":f16-vapproxgelu_riscv64_standalone", + ":f16-vcos_riscv64_standalone", + ":f16-vexp_riscv64_standalone", + ":f16-vgelu_riscv64_standalone", + ":f16-vsin_riscv64_standalone", + ":f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone", + ":f32-argmaxpool_riscv64_standalone", + ":f32-avgpool_riscv64_standalone", + ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone", + ":f32-conv-hwc2chw_riscv64_standalone", + ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone", + ":f32-dwconv2d-chw_riscv64_standalone", + ":f32-dwconv_arch=rv64gcv-abi=lp64d_standalone", + ":f32-dwconv_riscv64_standalone", + ":f32-f16-vcvt_riscv64_standalone", + ":f32-gemm_arch=rv64gcv-abi=lp64d_standalone", + ":f32-gemm_riscv64_standalone", + ":f32-ibilinear-chw_riscv64_standalone", + ":f32-ibilinear_riscv64_standalone", + ":f32-igemm_arch=rv64gcv-abi=lp64d_standalone", + ":f32-igemm_riscv64_standalone", + ":f32-maxpool_arch=rv64gcv-abi=lp64d_standalone", + ":f32-maxpool_riscv64_standalone", + ":f32-qc4w-gemm_riscv64_standalone", + ":f32-qc8w-gemm_riscv64_standalone", + ":f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone", + ":f32-qs8-vcvt_riscv64_standalone", + ":f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone", + ":f32-qu8-vcvt_riscv64_standalone", + ":f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone", + ":f32-raddstoreexpminusmax_riscv64_standalone", + ":f32-rdminmax_riscv64_standalone", + ":f32-rdsum_arch=rv64gcv-abi=lp64d_standalone", + ":f32-rdsum_riscv64_standalone", + ":f32-rminmax_arch=rv64gcv-abi=lp64d_standalone", + ":f32-rminmax_riscv64_standalone", + ":f32-rsum_riscv64_standalone", + ":f32-spmm_arch=rv64gcv-abi=lp64d_standalone", + ":f32-spmm_riscv64_standalone", + ":f32-vapproxgelu_riscv64_standalone", + ":f32-vbinary_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vbinary_riscv64_standalone", + ":f32-vclamp_riscv64_standalone", + ":f32-vcmul_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vcmul_riscv64_standalone", + ":f32-vcopysign_riscv64_standalone", + ":f32-vcos_riscv64_standalone", + ":f32-velu_riscv64_standalone", + ":f32-vexp_riscv64_standalone", + ":f32-vgelu_riscv64_standalone", + ":f32-vhswish_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vhswish_riscv64_standalone", + ":f32-vlog_riscv64_standalone", + ":f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vlrelu_riscv64_standalone", + ":f32-vmulcaddc_riscv64_standalone", + ":f32-vrnd_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vrnd_riscv64_standalone", + ":f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone", + ":f32-vrsqrt_riscv64_standalone", + ":f32-vsigmoid_riscv64_standalone", + ":f32-vsin_riscv64_standalone", + ":f32-vsqrt_riscv64_standalone", + ":f32-vtanh_riscv64_standalone", + ":f32-vunary_riscv64_standalone", + ":operators_riscv64_standalone", + ":qd8-f32-qb4w-gemm_riscv64_standalone", + ":qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone", + ":qd8-f32-qc4w-gemm_riscv64_standalone", + ":qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone", + ":qd8-f32-qc8w-gemm_riscv64_standalone", + ":qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone", + ":qd8-f32-qc8w-igemm_riscv64_standalone", + ":qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-dwconv_riscv64_standalone", + ":qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-f32-vcvt_riscv64_standalone", + ":qs8-packw_riscv64_standalone", + ":qs8-qc4w-gemm_riscv64_standalone", + ":qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-qc8w-dwconv_riscv64_standalone", + ":qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-qc8w-gemm_riscv64_standalone", + ":qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-qc8w-igemm_riscv64_standalone", + ":qs8-qu8-packw_riscv64_standalone", + ":qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-rdsum_riscv64_standalone", + ":qs8-rsum_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-rsum_riscv64_standalone", + ":qs8-vadd_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-vadd_riscv64_standalone", + ":qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-vaddc_riscv64_standalone", + ":qs8-vcvt_riscv64_standalone", + ":qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-vlrelu_riscv64_standalone", + ":qs8-vmul_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-vmul_riscv64_standalone", + ":qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone", + ":qs8-vmulc_riscv64_standalone", + ":qs8-vprelu_riscv64_standalone", + ":qs8-vpreluc_riscv64_standalone", + ":qs8-vrpreluc_riscv64_standalone", + ":qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-dwconv_riscv64_standalone", + ":qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-f32-vcvt_riscv64_standalone", + ":qu8-gemm_riscv64_standalone", + ":qu8-igemm_riscv64_standalone", + ":qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-rdsum_riscv64_standalone", + ":qu8-rsum_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-rsum_riscv64_standalone", + ":qu8-vadd_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-vadd_riscv64_standalone", + ":qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-vaddc_riscv64_standalone", + ":qu8-vcvt_riscv64_standalone", + ":qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-vlrelu_riscv64_standalone", + ":qu8-vmul_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-vmul_riscv64_standalone", + ":qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone", + ":qu8-vmulc_riscv64_standalone", + ":qu8-vprelu_riscv64_standalone", + ":qu8-vpreluc_riscv64_standalone", + ":qu8-vrpreluc_riscv64_standalone", + ":reference_riscv64_standalone", + ":s8-ibilinear_riscv64_standalone", + ":s8-maxpool_riscv64_standalone", + ":s8-rdminmax_riscv64_standalone", + ":s8-rminmax_riscv64_standalone", + ":s8-vclamp_arch=rv64gcv-abi=lp64d_standalone", + ":s8-vclamp_riscv64_standalone", + ":subgraph_riscv64_standalone", + ":tables_riscv64_standalone", + ":u8-ibilinear_riscv64_standalone", + ":u8-lut32norm_riscv64_standalone", + ":u8-maxpool_riscv64_standalone", + ":u8-rdminmax_riscv64_standalone", + ":u8-rminmax_riscv64_standalone", + ":u8-vclamp_arch=rv64gcv-abi=lp64d_standalone", + ":u8-vclamp_riscv64_standalone", + ":x16-transposec_riscv64_standalone", + ":x16-x32-packw_riscv64_standalone", + ":x24-transposec_riscv64_standalone", + ":x32-packw_arch=rv64gcv-abi=lp64d_standalone", + ":x32-packw_riscv64_standalone", + ":x32-transposec_arch=rv64gcv-abi=lp64d_standalone", + ":x32-transposec_riscv64_standalone", + ":x32-unpool_riscv64_standalone", + ":x64-transposec_riscv64_standalone", + ":x8-lut_riscv64_standalone", + ":x8-packq_riscv64_standalone", + ":x8-packw_riscv64_standalone", + ":x8-transposec_riscv64_standalone", + ":xx-copy_riscv64_standalone", + ":xx-fill_riscv64_standalone", + ":xx-pad_riscv64_standalone", + ":xx-transposev_riscv64_standalone", + ] + } } else { xnnpack_deps = [] - xnnpack_standalone_deps = [] + if (build_with_internal_optimization_guide) { + xnnpack_standalone_deps = [] + } } source_set("xnnpack") { @@ -1850,51 +1859,53 @@ } # This is a target that cannot depend on //base. -source_set("xnnpack_standalone") { - public = [ "src/include/xnnpack.h" ] +if (build_with_internal_optimization_guide) { + source_set("xnnpack_standalone") { + public = [ "src/include/xnnpack.h" ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - sources = [ - "build_identifier.c", - "src/include/xnnpack.h", - "src/src/allocator.c", - "src/src/cache.c", - "src/src/datatype.c", - "src/src/indirection.c", - "src/src/init.c", - "src/src/log.c", - "src/src/memory-planner.c", - "src/src/memory.c", - "src/src/microkernel-utils.c", - "src/src/microparams-init.c", - "src/src/mutex.c", - "src/src/normalization.c", - "src/src/operator-delete.c", - "src/src/operator-run.c", - "src/src/operator-utils.c", - "src/src/pack-lh.cc", - "src/src/params.c", - "src/src/runtime.c", - "src/src/sanitizers.c", - "src/src/subgraph.c", - "src/src/tensor.c", - ] + sources = [ + "build_identifier.c", + "src/include/xnnpack.h", + "src/src/allocator.c", + "src/src/cache.c", + "src/src/datatype.c", + "src/src/indirection.c", + "src/src/init.c", + "src/src/log.c", + "src/src/memory-planner.c", + "src/src/memory.c", + "src/src/microkernel-utils.c", + "src/src/microparams-init.c", + "src/src/mutex.c", + "src/src/normalization.c", + "src/src/operator-delete.c", + "src/src/operator-run.c", + "src/src/operator-utils.c", + "src/src/pack-lh.cc", + "src/src/params.c", + "src/src/runtime.c", + "src/src/sanitizers.c", + "src/src/subgraph.c", + "src/src/tensor.c", + ] - deps = xnnpack_standalone_deps + [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = xnnpack_standalone_deps + [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -1946,53 +1957,55 @@ } # This is a target that cannot depend on //base. - source_set("configs_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("configs_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/configs/argmaxpool-config.c", - "src/src/configs/avgpool-config.c", - "src/src/configs/binary-elementwise-config.c", - "src/src/configs/cmul-config.c", - "src/src/configs/conv-hwc2chw-config.c", - "src/src/configs/dwconv-config.c", - "src/src/configs/dwconv2d-chw-config.c", - "src/src/configs/gemm-config.c", - "src/src/configs/hardware-config.c", - "src/src/configs/ibilinear-chw-config.c", - "src/src/configs/ibilinear-config.c", - "src/src/configs/lut32norm-config.c", - "src/src/configs/maxpool-config.c", - "src/src/configs/pack-lh-config.c", - "src/src/configs/raddstoreexpminusmax-config.c", - "src/src/configs/reduce-config.c", - "src/src/configs/spmm-config.c", - "src/src/configs/transpose-config.c", - "src/src/configs/unary-elementwise-config.c", - "src/src/configs/unpool-config.c", - "src/src/configs/vmulcaddc-config.c", - "src/src/configs/x8-lut-config.c", - "src/src/configs/xx-fill-config.c", - "src/src/configs/xx-pad-config.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/configs/argmaxpool-config.c", + "src/src/configs/avgpool-config.c", + "src/src/configs/binary-elementwise-config.c", + "src/src/configs/cmul-config.c", + "src/src/configs/conv-hwc2chw-config.c", + "src/src/configs/dwconv-config.c", + "src/src/configs/dwconv2d-chw-config.c", + "src/src/configs/gemm-config.c", + "src/src/configs/hardware-config.c", + "src/src/configs/ibilinear-chw-config.c", + "src/src/configs/ibilinear-config.c", + "src/src/configs/lut32norm-config.c", + "src/src/configs/maxpool-config.c", + "src/src/configs/pack-lh-config.c", + "src/src/configs/raddstoreexpminusmax-config.c", + "src/src/configs/reduce-config.c", + "src/src/configs/spmm-config.c", + "src/src/configs/transpose-config.c", + "src/src/configs/unary-elementwise-config.c", + "src/src/configs/unpool-config.c", + "src/src/configs/vmulcaddc-config.c", + "src/src/configs/x8-lut-config.c", + "src/src/configs/xx-fill-config.c", + "src/src/configs/xx-pad-config.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2024,34 +2037,36 @@ } # This is a target that cannot depend on //base. - source_set("enums_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("enums_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/enums/allocation-type.c", - "src/src/enums/datatype-strings.c", - "src/src/enums/microkernel-type.c", - "src/src/enums/node-type.c", - "src/src/enums/operator-type.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/enums/allocation-type.c", + "src/src/enums/datatype-strings.c", + "src/src/enums/microkernel-type.c", + "src/src/enums/node-type.c", + "src/src/enums/operator-type.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2083,34 +2098,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2145,37 +2162,39 @@ } # This is a target that cannot depend on //base. - source_set("f16-dwconv_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-dwconv_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c", - "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c", - "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c", - "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c", + "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c", + "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c", + "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2208,35 +2227,37 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2273,39 +2294,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2337,34 +2360,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2395,33 +2420,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2452,33 +2479,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2506,30 +2535,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2562,35 +2593,37 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c", - "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c", + "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2623,35 +2656,37 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c", - "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c", + "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2688,39 +2723,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2752,34 +2789,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2816,39 +2855,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2880,34 +2921,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2939,34 +2982,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-c8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-c8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -2998,34 +3043,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-maxpool_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-maxpool_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3056,33 +3103,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3110,30 +3159,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qs8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qs8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3161,30 +3212,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qu8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qu8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3216,34 +3269,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3272,31 +3327,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-rdminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rdminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", - "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", + "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3335,41 +3392,43 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c", - "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c", - "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c", + "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c", + "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3411,44 +3470,46 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512fp16", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512fp16", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c", - "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c", - "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c", + "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c", + "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3480,34 +3541,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/f16-rmax-f16c-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/f16-rmax-f16c-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3537,32 +3600,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-rminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3590,30 +3655,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vapproxgelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vapproxgelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3671,60 +3738,62 @@ } # This is a target that cannot depend on //base. - source_set( - "f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512fp16", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512fp16", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c", - "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c", + "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3774,52 +3843,54 @@ } # This is a target that cannot depend on //base. - source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c", - "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c", - "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c", - "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c", - "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c", + "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c", + "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c", + "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c", + "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3851,34 +3922,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3906,30 +3979,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vcos_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vcos_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -3961,34 +4036,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-velu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-velu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4016,30 +4093,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vexp_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vexp_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4067,30 +4146,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vgelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vgelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4122,34 +4203,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4181,34 +4264,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4240,34 +4325,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4302,37 +4389,39 @@ } # This is a target that cannot depend on //base. - source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c", - "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c", - "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c", - "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c", + "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c", + "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c", + "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4364,34 +4453,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4423,34 +4514,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsigmoid_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vsigmoid_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4478,30 +4571,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsin_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vsin_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4533,34 +4628,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4592,34 +4689,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vtanh_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vtanh_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4651,34 +4750,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4710,34 +4811,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4769,34 +4872,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-vunary_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f16-vunary_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c", - "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c", + "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4827,33 +4932,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-argmaxpool_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-argmaxpool_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4881,30 +4988,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-argmaxpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-argmaxpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4937,35 +5046,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -4993,30 +5104,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5047,33 +5160,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5101,30 +5216,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5155,33 +5272,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5209,30 +5328,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-conv-hwc2chw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-conv-hwc2chw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5266,36 +5387,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5326,33 +5449,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5387,37 +5512,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5453,38 +5580,40 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5515,33 +5644,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5576,37 +5707,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5640,36 +5773,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5706,39 +5841,41 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5771,35 +5908,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5836,39 +5975,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5900,34 +6041,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") { - cflags = [ - "-mf16c", - "-mno-avx2", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") { + cflags = [ + "-mf16c", + "-mno-avx2", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -5958,33 +6101,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6015,33 +6160,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6069,30 +6216,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6128,38 +6277,40 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6190,33 +6341,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6255,41 +6408,43 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c", - "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c", + "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6322,35 +6477,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c", - "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c", + "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6385,37 +6542,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6446,33 +6605,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear-chw_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear-chw_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6500,30 +6661,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear-chw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear-chw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6554,33 +6717,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear/gen/f32-ibilinear-sse-c8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear/gen/f32-ibilinear-sse-c8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6608,30 +6773,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6667,38 +6834,40 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6729,33 +6898,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6794,41 +6965,43 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c", - "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c", - "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c", + "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c", + "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6861,35 +7034,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c", - "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c", + "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6924,37 +7099,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -6985,33 +7162,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-maxpool_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-maxpool_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7039,30 +7218,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-maxpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-maxpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7096,36 +7277,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7158,35 +7341,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7219,35 +7404,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7279,34 +7466,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7335,31 +7524,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7393,36 +7584,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7455,35 +7648,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7523,42 +7718,44 @@ } # This is a target that cannot depend on //base. - source_set( - "f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7591,35 +7788,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7651,34 +7850,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-sse41-dup.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-sse41-dup.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-sse41-dup.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-sse41-dup.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7707,31 +7908,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7764,35 +7967,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7824,34 +8029,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7888,39 +8095,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -7951,33 +8160,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8008,33 +8219,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8063,31 +8276,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8120,35 +8335,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8180,34 +8397,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8244,39 +8463,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8307,33 +8528,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8362,31 +8585,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8414,30 +8639,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8469,34 +8696,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8533,39 +8762,41 @@ } # This is a target that cannot depend on //base. - source_set( - "f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8596,33 +8827,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8650,30 +8883,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8707,36 +8942,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-c32.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-c32.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8765,31 +9002,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-c32.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-c32.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8821,34 +9060,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-c32.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-c32.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8877,31 +9118,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8934,35 +9177,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -8990,30 +9235,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9044,33 +9291,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-c16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-c16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9098,30 +9347,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9156,37 +9407,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9216,32 +9469,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9274,35 +9529,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9332,32 +9589,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9390,35 +9649,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9446,30 +9707,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9500,33 +9763,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9554,30 +9819,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9608,33 +9875,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-spmm_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-spmm_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9664,32 +9933,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-spmm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-spmm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9722,35 +9993,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9778,30 +10051,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9833,34 +10108,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9892,34 +10169,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2-rational-12-10-div.c", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2fma-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2-rational-12-10-div.c", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2fma-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -9947,30 +10226,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10021,53 +10302,55 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c", - "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c", + "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10113,48 +10396,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c", - "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c", + "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10200,48 +10485,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c", - "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c", + "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10274,35 +10561,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c", - "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c", + "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10348,48 +10637,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10422,35 +10713,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10478,30 +10771,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10532,33 +10827,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10586,30 +10883,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10637,30 +10936,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10692,34 +10993,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10750,33 +11053,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10804,30 +11109,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10862,37 +11169,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10922,32 +11231,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -10980,35 +11291,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11038,32 +11351,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11096,35 +11411,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11152,30 +11469,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11207,34 +11526,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11266,34 +11587,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", - "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", + "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11321,30 +11644,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11377,35 +11702,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11433,30 +11760,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11488,34 +11817,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11546,33 +11877,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11600,30 +11933,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11656,35 +11991,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11712,30 +12049,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11767,34 +12106,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11826,34 +12167,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c", - "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c", + "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11881,30 +12224,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11937,35 +12282,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -11993,30 +12340,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12048,34 +12397,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12107,34 +12458,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c", - "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c", + "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12162,30 +12515,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12218,35 +12573,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12274,30 +12631,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12329,34 +12688,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-fma3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-fma3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12388,34 +12749,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-sse2.c", - "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-sse2.c", + "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12443,30 +12806,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12494,30 +12859,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12549,34 +12916,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12608,34 +12977,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12667,34 +13038,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c", - "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c", + "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12722,30 +13095,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12778,35 +13153,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12834,30 +13211,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12888,33 +13267,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12945,33 +13326,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -12999,30 +13382,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13053,33 +13438,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vmulcaddc_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vmulcaddc_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13107,30 +13494,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vmulcaddc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vmulcaddc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13166,38 +13555,40 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c", - "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c", - "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c", - "src/src/f32-vrnd/gen/f32-vrndz-avx-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c", + "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c", + "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c", + "src/src/f32-vrnd/gen/f32-vrndz-avx-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13228,33 +13619,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c", - "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c", - "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c", - "src/src/f32-vrnd/gen/f32-vrndz-avx512f-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c", + "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c", + "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c", + "src/src/f32-vrnd/gen/f32-vrndz-avx512f-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13288,36 +13681,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c", - "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c", - "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c", - "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c", + "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c", + "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c", + "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13351,36 +13746,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c", - "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c", - "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c", - "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c", + "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c", + "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c", + "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13411,33 +13808,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13471,36 +13870,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13529,31 +13930,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13585,34 +13988,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13641,31 +14046,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13698,35 +14105,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13754,30 +14163,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13809,34 +14220,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13867,33 +14280,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13924,33 +14339,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -13978,30 +14395,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14034,35 +14453,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14090,30 +14511,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14145,34 +14568,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14204,34 +14629,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c", - "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c", + "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14259,30 +14686,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14316,36 +14745,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c", - "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c", + "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14373,30 +14804,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14428,34 +14861,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c", - "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c", + "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14483,30 +14918,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14539,35 +14976,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14595,30 +15034,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14650,34 +15091,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_f16c-fma-no-avx2_standalone") { - cflags = [ - "-mf16c", - "-mfma", - "-mno-avx2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_f16c-fma-no-avx2_standalone") { + cflags = [ + "-mf16c", + "-mfma", + "-mno-avx2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14709,34 +15152,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c", - "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c", + "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14764,30 +15209,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14822,37 +15269,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-avx.c", - "src/src/f32-vunary/gen/f32-vneg-avx.c", - "src/src/f32-vunary/gen/f32-vsqr-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-avx.c", + "src/src/f32-vunary/gen/f32-vneg-avx.c", + "src/src/f32-vunary/gen/f32-vsqr-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14882,32 +15331,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-avx512f.c", - "src/src/f32-vunary/gen/f32-vneg-avx512f.c", - "src/src/f32-vunary/gen/f32-vsqr-avx512f.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-avx512f.c", + "src/src/f32-vunary/gen/f32-vneg-avx512f.c", + "src/src/f32-vunary/gen/f32-vsqr-avx512f.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14940,35 +15391,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-sse2.c", - "src/src/f32-vunary/gen/f32-vneg-sse2.c", - "src/src/f32-vunary/gen/f32-vsqr-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-sse2.c", + "src/src/f32-vunary/gen/f32-vneg-sse2.c", + "src/src/f32-vunary/gen/f32-vsqr-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -14998,32 +15451,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-scalar.c", - "src/src/f32-vunary/gen/f32-vneg-scalar.c", - "src/src/f32-vunary/gen/f32-vsqr-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-scalar.c", + "src/src/f32-vunary/gen/f32-vneg-scalar.c", + "src/src/f32-vunary/gen/f32-vsqr-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15071,50 +15526,52 @@ } # This is a target that cannot depend on //base. - source_set("operators_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("operators_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/operators/argmax-pooling-nhwc.c", - "src/src/operators/average-pooling-nhwc.c", - "src/src/operators/batch-matrix-multiply-nc.c", - "src/src/operators/binary-elementwise-nd.c", - "src/src/operators/constant-pad-nd.c", - "src/src/operators/convolution-nchw.c", - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", - "src/src/operators/reduce-nd.c", - "src/src/operators/resize-bilinear-nchw.c", - "src/src/operators/resize-bilinear-nhwc.c", - "src/src/operators/rope-nthc.c", - "src/src/operators/slice-nd.c", - "src/src/operators/softmax-nc.c", - "src/src/operators/transpose-nd.c", - "src/src/operators/unary-elementwise-nc.c", - "src/src/operators/unpooling-nhwc.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/operators/argmax-pooling-nhwc.c", + "src/src/operators/average-pooling-nhwc.c", + "src/src/operators/batch-matrix-multiply-nc.c", + "src/src/operators/binary-elementwise-nd.c", + "src/src/operators/constant-pad-nd.c", + "src/src/operators/convolution-nchw.c", + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", + "src/src/operators/reduce-nd.c", + "src/src/operators/resize-bilinear-nchw.c", + "src/src/operators/resize-bilinear-nhwc.c", + "src/src/operators/rope-nthc.c", + "src/src/operators/slice-nd.c", + "src/src/operators/softmax-nc.c", + "src/src/operators/transpose-nd.c", + "src/src/operators/unary-elementwise-nc.c", + "src/src/operators/unpooling-nhwc.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15147,35 +15604,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15209,36 +15668,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15271,35 +15732,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15337,40 +15800,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15409,41 +15874,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15477,36 +15944,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15539,35 +16008,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15605,40 +16076,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15677,41 +16150,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15753,44 +16228,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15824,36 +16301,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15886,35 +16365,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -15952,40 +16433,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16024,41 +16507,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16100,44 +16585,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16171,36 +16658,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-avx-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-avx-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16233,35 +16722,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16300,41 +16791,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16374,42 +16867,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16441,34 +16936,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16500,34 +16997,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16556,31 +17055,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16614,36 +17115,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16676,35 +17179,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16744,42 +17249,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16818,41 +17325,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16892,42 +17401,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -16969,44 +17480,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17038,34 +17551,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17097,34 +17612,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-ssse3-madd.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-ssse3-madd.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17153,31 +17670,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17211,36 +17730,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17273,35 +17794,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17341,42 +17864,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17415,41 +17940,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17491,44 +18018,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17560,34 +18089,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17619,34 +18150,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17676,32 +18209,34 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17735,36 +18270,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17797,35 +18334,37 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17865,42 +18404,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -17939,41 +18480,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18015,44 +18558,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18084,34 +18629,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18143,34 +18690,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18200,32 +18749,34 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18259,36 +18810,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18321,35 +18874,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18387,40 +18942,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18452,34 +19009,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18511,34 +19070,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18569,33 +19130,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18627,34 +19190,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18687,35 +19252,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18747,34 +19314,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18811,39 +19380,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18874,33 +19445,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18931,33 +19504,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -18985,30 +19560,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19042,36 +19619,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-packw_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-packw_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", - "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", + "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19111,42 +19690,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", - "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", - "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", + "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", + "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19174,30 +19755,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-packw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-packw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19225,30 +19808,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc4w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc4w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19283,37 +19868,39 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19347,36 +19934,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19415,41 +20004,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19482,35 +20073,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19543,35 +20136,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19604,35 +20199,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19666,36 +20263,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19729,36 +20328,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19792,36 +20393,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19854,35 +20457,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19922,42 +20527,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -19996,41 +20603,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20072,44 +20681,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20141,34 +20752,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20200,34 +20813,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20256,31 +20871,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20314,36 +20931,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x4c8-minmax-fp32-avx-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x4c8-minmax-fp32-avx-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20377,36 +20996,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20440,36 +21061,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20502,35 +21125,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20570,42 +21195,44 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20644,41 +21271,43 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20720,44 +21349,46 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { - cflags = [ - "-mamx-int8", - "-mamx-tile", - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - "-mgfni", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") { + cflags = [ + "-mamx-int8", + "-mamx-tile", + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + "-mgfni", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20789,34 +21420,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20848,34 +21481,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20904,31 +21539,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -20961,35 +21598,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21027,40 +21666,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21088,30 +21729,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qu8-packw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qu8-packw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21143,34 +21786,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21206,39 +21851,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21269,33 +21916,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21323,30 +21972,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21379,35 +22030,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_avx2-avxvnni-f16c-fma_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_avx2-avxvnni-f16c-fma_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21439,34 +22092,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21503,40 +22158,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c", - "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c", + "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21574,40 +22231,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mavx512vnni", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mavx512vnni", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21638,33 +22297,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21692,30 +22353,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21748,35 +22411,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21808,34 +22473,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21871,39 +22538,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21934,33 +22603,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -21991,33 +22662,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22046,31 +22719,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22103,35 +22778,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22163,34 +22840,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22226,39 +22905,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22289,33 +22970,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22346,33 +23029,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22401,31 +23086,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22458,35 +23145,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22518,34 +23207,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22576,33 +23267,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22633,33 +23326,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22690,33 +23385,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22744,30 +23441,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22800,35 +23499,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22860,34 +23561,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22918,33 +23621,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -22975,33 +23680,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23032,33 +23739,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23086,30 +23795,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23142,35 +23853,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23201,33 +23914,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23258,33 +23973,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23312,30 +24029,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23368,35 +24087,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23427,33 +24148,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23484,33 +24207,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23538,30 +24263,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23593,34 +24320,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vprelu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vprelu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23648,30 +24377,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vprelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vprelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23703,34 +24434,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vpreluc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vpreluc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23758,30 +24491,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vpreluc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vpreluc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23813,34 +24548,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23868,30 +24605,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vrpreluc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vrpreluc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23925,36 +24664,38 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -23987,35 +24728,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24053,40 +24796,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24118,34 +24863,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24177,34 +24924,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24235,33 +24984,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24294,35 +25045,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24354,34 +25107,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24418,39 +25173,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24481,33 +25238,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24538,33 +25297,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24592,30 +25353,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24649,36 +25412,38 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c", - "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c", + "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24711,35 +25476,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24776,40 +25543,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c", - "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c", + "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24841,34 +25610,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24900,34 +25671,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -24956,31 +25729,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25014,36 +25789,38 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c", - "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c", + "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25076,35 +25853,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25141,40 +25920,42 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c", - "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c", + "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25206,34 +25987,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25265,34 +26048,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25321,31 +26106,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25376,33 +26163,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25430,30 +26219,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rdsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rdsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25485,34 +26276,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25543,33 +26336,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25597,30 +26392,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25653,35 +26450,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25713,34 +26512,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25776,39 +26577,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25839,33 +26642,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25896,33 +26701,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -25951,31 +26758,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26008,35 +26817,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26068,34 +26879,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26131,39 +26944,41 @@ } # This is a target that cannot depend on //base. - source_set( - "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26194,33 +27009,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26251,33 +27068,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26306,31 +27125,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26363,35 +27184,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26423,34 +27246,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26481,33 +27306,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26538,33 +27365,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26595,33 +27424,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26649,30 +27480,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26705,35 +27538,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26765,34 +27600,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26823,33 +27660,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26880,33 +27719,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26937,33 +27778,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -26991,30 +27834,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27047,35 +27892,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27106,33 +27953,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27163,33 +28012,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27217,30 +28068,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27273,35 +28126,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27332,33 +28187,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27389,33 +28246,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27443,30 +28302,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27498,34 +28359,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vprelu_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vprelu_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27553,30 +28416,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vprelu_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vprelu_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27608,34 +28473,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vpreluc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vpreluc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27663,30 +28530,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vpreluc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vpreluc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27718,34 +28587,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27773,30 +28644,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vrpreluc_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vrpreluc_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27826,32 +28699,34 @@ } # This is a target that cannot depend on //base. - source_set("reference_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("reference_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/reference/binary-elementwise.cc", - "src/src/reference/packing.cc", - "src/src/reference/unary-elementwise.cc", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/reference/binary-elementwise.cc", + "src/src/reference/packing.cc", + "src/src/reference/unary-elementwise.cc", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27882,33 +28757,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-ibilinear_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-ibilinear_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-c8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-c8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27939,33 +28816,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-c16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-c16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -27993,30 +28872,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-ibilinear_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-ibilinear_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28047,33 +28928,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28101,30 +28984,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-maxpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-maxpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28156,34 +29041,36 @@ } # This is a target that cannot depend on //base. - source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-c32.c", - "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-c32.c", + "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28212,31 +29099,33 @@ } # This is a target that cannot depend on //base. - source_set("s8-rdminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rdminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", - "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", + "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28269,35 +29158,37 @@ } # This is a target that cannot depend on //base. - source_set("s8-rminmax_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-rminmax_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c", - "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c", - "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c", + "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c", + "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28327,32 +29218,34 @@ } # This is a target that cannot depend on //base. - source_set("s8-rminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28384,34 +29277,36 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-avx2-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-avx2-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28447,39 +29342,41 @@ } # This is a target that cannot depend on //base. - source_set( - "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28510,33 +29407,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-sse2-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-sse2-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28567,33 +29466,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-sse41-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-sse41-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28621,30 +29522,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28700,58 +29603,60 @@ } # This is a target that cannot depend on //base. - source_set("subgraph_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("subgraph_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/subgraph/argmax-pooling-2d.c", - "src/src/subgraph/average-pooling-2d.c", - "src/src/subgraph/batch-matrix-multiply.c", - "src/src/subgraph/binary.c", - "src/src/subgraph/concatenate.c", - "src/src/subgraph/convolution-2d.c", - "src/src/subgraph/copy.c", - "src/src/subgraph/deconvolution-2d.c", - "src/src/subgraph/deprecated.c", - "src/src/subgraph/depth-to-space-2d.c", - "src/src/subgraph/depthwise-convolution-2d.c", - "src/src/subgraph/even-split.c", - "src/src/subgraph/fully-connected-sparse.c", - "src/src/subgraph/fully-connected.c", - "src/src/subgraph/max-pooling-2d.c", - "src/src/subgraph/pack-lh.c", - "src/src/subgraph/reshape-helpers.c", - "src/src/subgraph/rope.c", - "src/src/subgraph/softmax.c", - "src/src/subgraph/space-to-depth-2d.c", - "src/src/subgraph/static-constant-pad.c", - "src/src/subgraph/static-reduce.c", - "src/src/subgraph/static-resize-bilinear-2d.c", - "src/src/subgraph/static-slice.c", - "src/src/subgraph/static-transpose.c", - "src/src/subgraph/subgraph-utils.c", - "src/src/subgraph/unary.c", - "src/src/subgraph/unpooling-2d.c", - "src/src/subgraph/validation.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/subgraph/argmax-pooling-2d.c", + "src/src/subgraph/average-pooling-2d.c", + "src/src/subgraph/batch-matrix-multiply.c", + "src/src/subgraph/binary.c", + "src/src/subgraph/concatenate.c", + "src/src/subgraph/convolution-2d.c", + "src/src/subgraph/copy.c", + "src/src/subgraph/deconvolution-2d.c", + "src/src/subgraph/deprecated.c", + "src/src/subgraph/depth-to-space-2d.c", + "src/src/subgraph/depthwise-convolution-2d.c", + "src/src/subgraph/even-split.c", + "src/src/subgraph/fully-connected-sparse.c", + "src/src/subgraph/fully-connected.c", + "src/src/subgraph/max-pooling-2d.c", + "src/src/subgraph/pack-lh.c", + "src/src/subgraph/reshape-helpers.c", + "src/src/subgraph/rope.c", + "src/src/subgraph/softmax.c", + "src/src/subgraph/space-to-depth-2d.c", + "src/src/subgraph/static-constant-pad.c", + "src/src/subgraph/static-reduce.c", + "src/src/subgraph/static-resize-bilinear-2d.c", + "src/src/subgraph/static-slice.c", + "src/src/subgraph/static-transpose.c", + "src/src/subgraph/subgraph-utils.c", + "src/src/subgraph/unary.c", + "src/src/subgraph/unpooling-2d.c", + "src/src/subgraph/validation.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28787,38 +29692,40 @@ } # This is a target that cannot depend on //base. - source_set("tables_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("tables_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/tables/exp2-k-over-2048.c", - "src/src/tables/exp2-k-over-64.c", - "src/src/tables/exp2minus-k-over-16.c", - "src/src/tables/exp2minus-k-over-2048.c", - "src/src/tables/exp2minus-k-over-32.c", - "src/src/tables/exp2minus-k-over-4.c", - "src/src/tables/exp2minus-k-over-64.c", - "src/src/tables/exp2minus-k-over-8.c", - "src/src/tables/vlog.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/tables/exp2-k-over-2048.c", + "src/src/tables/exp2-k-over-64.c", + "src/src/tables/exp2minus-k-over-16.c", + "src/src/tables/exp2minus-k-over-2048.c", + "src/src/tables/exp2minus-k-over-32.c", + "src/src/tables/exp2minus-k-over-4.c", + "src/src/tables/exp2minus-k-over-64.c", + "src/src/tables/exp2minus-k-over-8.c", + "src/src/tables/vlog.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28849,33 +29756,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-ibilinear_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-ibilinear_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-c8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-c8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28906,33 +29815,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") { - cflags = [ - "-mno-sse4.2", - "-msse4.1", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") { + cflags = [ + "-mno-sse4.2", + "-msse4.1", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-c16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-c16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -28960,30 +29871,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-ibilinear_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-ibilinear_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29011,30 +29924,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-lut32norm_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-lut32norm_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-lut32norm/u8-lut32norm-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-lut32norm/u8-lut32norm-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29065,33 +29980,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-maxpool_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-maxpool_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29119,30 +30036,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-maxpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-maxpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29174,34 +30093,36 @@ } # This is a target that cannot depend on //base. - source_set("u8-rdminmax_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-rdminmax_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-c32.c", - "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-c32.c", + "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29230,31 +30151,33 @@ } # This is a target that cannot depend on //base. - source_set("u8-rdminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rdminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", - "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", + "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29287,35 +30210,37 @@ } # This is a target that cannot depend on //base. - source_set("u8-rminmax_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-rminmax_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c", - "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c", - "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c", + "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c", + "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29345,32 +30270,34 @@ } # This is a target that cannot depend on //base. - source_set("u8-rminmax_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rminmax_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29402,34 +30329,36 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-avx2-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-avx2-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29465,39 +30394,41 @@ } # This is a target that cannot depend on //base. - source_set( - "u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29528,33 +30459,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-sse2-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-sse2-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29582,30 +30515,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29637,34 +30572,36 @@ } # This is a target that cannot depend on //base. - source_set("x16-packw_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("x16-packw_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29696,34 +30633,36 @@ } # This is a target that cannot depend on //base. - source_set("x16-transposec_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("x16-transposec_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29754,33 +30693,35 @@ } # This is a target that cannot depend on //base. - source_set("x16-transposec_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("x16-transposec_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29808,30 +30749,32 @@ } # This is a target that cannot depend on //base. - source_set("x16-transposec_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-transposec_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29860,31 +30803,33 @@ } # This is a target that cannot depend on //base. - source_set("x16-x32-packw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-x32-packw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29915,33 +30860,35 @@ } # This is a target that cannot depend on //base. - source_set("x24-transposec_ssse3-no-sse4.1_standalone") { - cflags = [ - "-mno-sse4.1", - "-mssse3", - ] + if (build_with_internal_optimization_guide) { + source_set("x24-transposec_ssse3-no-sse4.1_standalone") { + cflags = [ + "-mno-sse4.1", + "-mssse3", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x24-transposec/x24-transposec-4x4-ssse3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x24-transposec/x24-transposec-4x4-ssse3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -29969,30 +30916,32 @@ } # This is a target that cannot depend on //base. - source_set("x24-transposec_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x24-transposec_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30029,39 +30978,41 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx-u8.c", - "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c", - "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c", - "src/src/x32-packw/gen/x32-packw-x8-gemm-gio-avx-u8.c", - "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx-u8.c", + "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c", + "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c", + "src/src/x32-packw/gen/x32-packw-x8-gemm-gio-avx-u8.c", + "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30092,33 +31043,35 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_avx512f_standalone") { - cflags = [ "-mavx512f" ] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_avx512f_standalone") { + cflags = [ "-mavx512f" ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c", - "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c", - "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.c", - "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c", + "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c", + "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.c", + "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30150,34 +31103,36 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c", - "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c", + "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30210,35 +31165,37 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30271,35 +31228,37 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30330,33 +31289,35 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_sse-no-sse2_standalone") { - cflags = [ - "-mno-sse2", - "-msse", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_sse-no-sse2_standalone") { + cflags = [ + "-mno-sse2", + "-msse", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/x32-transposec-4x4-sse.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/x32-transposec-4x4-sse.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30384,30 +31345,32 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30438,33 +31401,35 @@ } # This is a target that cannot depend on //base. - source_set("x32-unpool_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-unpool_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-unpool/x32-unpool-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-unpool/x32-unpool-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30492,30 +31457,32 @@ } # This is a target that cannot depend on //base. - source_set("x32-unpool_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-unpool_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-unpool/x32-unpool-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-unpool/x32-unpool-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30548,35 +31515,37 @@ } # This is a target that cannot depend on //base. - source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30607,33 +31576,35 @@ } # This is a target that cannot depend on //base. - source_set("x64-transposec_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("x64-transposec_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30661,30 +31632,32 @@ } # This is a target that cannot depend on //base. - source_set("x64-transposec_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x64-transposec_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30717,35 +31690,37 @@ } # This is a target that cannot depend on //base. - source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") { - cflags = [ - "-mavx", - "-mno-avx2", - "-mno-f16c", - "-mno-fma", - ] + if (build_with_internal_optimization_guide) { + source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") { + cflags = [ + "-mavx", + "-mno-avx2", + "-mno-f16c", + "-mno-fma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-avx-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-avx-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30777,34 +31752,36 @@ } # This is a target that cannot depend on //base. - source_set("x8-lut_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("x8-lut_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-avx2-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-avx2-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30840,39 +31817,41 @@ } # This is a target that cannot depend on //base. - source_set( - "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30910,40 +31889,42 @@ } # This is a target that cannot depend on //base. - source_set( - "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vbmi", - "-mavx512vl", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set( + "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") { + cflags = [ + "-mavx512bw", + "-mavx512cd", + "-mavx512dq", + "-mavx512f", + "-mavx512vbmi", + "-mavx512vl", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -30971,30 +31952,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-lut_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-lut_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31022,30 +32005,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-packq_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packq_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31076,33 +32061,35 @@ } # This is a target that cannot depend on //base. - source_set("x8-packw_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packw_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31134,34 +32121,36 @@ } # This is a target that cannot depend on //base. - source_set("x8-transposec_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", - "-mf16c", - "-mfma", - ] + if (build_with_internal_optimization_guide) { + source_set("x8-transposec_f16c-fma-avx2_standalone") { + cflags = [ + "-mavx2", + "-mf16c", + "-mfma", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31192,33 +32181,35 @@ } # This is a target that cannot depend on //base. - source_set("x8-transposec_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("x8-transposec_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31246,30 +32237,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-transposec_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-transposec_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31297,30 +32290,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-copy_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-copy_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-copy/xx-copy-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-copy/xx-copy-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31351,33 +32346,35 @@ } # This is a target that cannot depend on //base. - source_set("xx-fill_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("xx-fill_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-fill/xx-fill-sse2-u64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-fill/xx-fill-sse2-u64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31405,30 +32402,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-fill_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-fill_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-fill/xx-fill-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-fill/xx-fill-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31459,33 +32458,35 @@ } # This is a target that cannot depend on //base. - source_set("xx-pad_sse2-no-sse3_standalone") { - cflags = [ - "-mno-sse3", - "-msse2", - ] + if (build_with_internal_optimization_guide) { + source_set("xx-pad_sse2-no-sse3_standalone") { + cflags = [ + "-mno-sse3", + "-msse2", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-pad/xx-pad-p16-sse2-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-pad/xx-pad-p16-sse2-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31513,30 +32514,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-pad_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-pad_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-pad/xx-pad-p4-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-pad/xx-pad-p4-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31564,30 +32567,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-transposev_x64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-transposev_x64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } } @@ -31640,53 +32645,55 @@ } # This is a target that cannot depend on //base. - source_set("configs_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("configs_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/configs/argmaxpool-config.c", - "src/src/configs/avgpool-config.c", - "src/src/configs/binary-elementwise-config.c", - "src/src/configs/cmul-config.c", - "src/src/configs/conv-hwc2chw-config.c", - "src/src/configs/dwconv-config.c", - "src/src/configs/dwconv2d-chw-config.c", - "src/src/configs/gemm-config.c", - "src/src/configs/hardware-config.c", - "src/src/configs/ibilinear-chw-config.c", - "src/src/configs/ibilinear-config.c", - "src/src/configs/lut32norm-config.c", - "src/src/configs/maxpool-config.c", - "src/src/configs/pack-lh-config.c", - "src/src/configs/raddstoreexpminusmax-config.c", - "src/src/configs/reduce-config.c", - "src/src/configs/spmm-config.c", - "src/src/configs/transpose-config.c", - "src/src/configs/unary-elementwise-config.c", - "src/src/configs/unpool-config.c", - "src/src/configs/vmulcaddc-config.c", - "src/src/configs/x8-lut-config.c", - "src/src/configs/xx-fill-config.c", - "src/src/configs/xx-pad-config.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/configs/argmaxpool-config.c", + "src/src/configs/avgpool-config.c", + "src/src/configs/binary-elementwise-config.c", + "src/src/configs/cmul-config.c", + "src/src/configs/conv-hwc2chw-config.c", + "src/src/configs/dwconv-config.c", + "src/src/configs/dwconv2d-chw-config.c", + "src/src/configs/gemm-config.c", + "src/src/configs/hardware-config.c", + "src/src/configs/ibilinear-chw-config.c", + "src/src/configs/ibilinear-config.c", + "src/src/configs/lut32norm-config.c", + "src/src/configs/maxpool-config.c", + "src/src/configs/pack-lh-config.c", + "src/src/configs/raddstoreexpminusmax-config.c", + "src/src/configs/reduce-config.c", + "src/src/configs/spmm-config.c", + "src/src/configs/transpose-config.c", + "src/src/configs/unary-elementwise-config.c", + "src/src/configs/unpool-config.c", + "src/src/configs/vmulcaddc-config.c", + "src/src/configs/x8-lut-config.c", + "src/src/configs/xx-fill-config.c", + "src/src/configs/xx-pad-config.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31718,34 +32725,36 @@ } # This is a target that cannot depend on //base. - source_set("enums_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("enums_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/enums/allocation-type.c", - "src/src/enums/datatype-strings.c", - "src/src/enums/microkernel-type.c", - "src/src/enums/node-type.c", - "src/src/enums/operator-type.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/enums/allocation-type.c", + "src/src/enums/datatype-strings.c", + "src/src/enums/microkernel-type.c", + "src/src/enums/node-type.c", + "src/src/enums/operator-type.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31773,30 +32782,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31824,30 +32835,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31878,33 +32891,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c", - "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c", - "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c", - "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c", + "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c", + "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c", + "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31936,34 +32951,36 @@ } # This is a target that cannot depend on //base. - source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c", - "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c", - "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c", - "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c", - "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c", + "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c", + "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c", + "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c", + "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -31993,32 +33010,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32046,30 +33065,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-c16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-c16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32097,30 +33118,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32151,33 +33174,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c", - "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c", - "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c", - "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c", + "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c", + "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c", + "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32212,37 +33237,39 @@ } # This is a target that cannot depend on //base. - source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S", - "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S", - "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S", - "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S", + "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S", + "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S", + "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32270,30 +33297,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32321,30 +33350,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-c8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-c8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32375,33 +33406,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c", - "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c", - "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c", - "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c", + "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c", + "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c", + "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32436,37 +33469,39 @@ } # This is a target that cannot depend on //base. - source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S", - "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S", - "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S", - "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S", + "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S", + "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S", + "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32494,30 +33529,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32545,30 +33582,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32596,30 +33635,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qs8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qs8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32647,30 +33688,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qu8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qu8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32698,30 +33741,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32750,31 +33795,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-c32.c", - "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-c32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-c32.c", + "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-c32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32803,31 +33850,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-rdminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rdminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", - "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", + "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32857,32 +33906,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c", - "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c", - "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c", + "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c", + "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32912,32 +33963,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-rminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -32965,30 +34018,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33016,30 +34071,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33067,30 +34124,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vapproxgelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vapproxgelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33139,51 +34198,53 @@ } # This is a target that cannot depend on //base. - source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c", - "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c", - "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c", - "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c", - "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c", - "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c", - "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c", - "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c", + "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c", + "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c", + "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c", + "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c", + "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c", + "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c", + "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33211,30 +34272,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33262,30 +34325,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33313,30 +34378,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33364,30 +34431,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vcos_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vcos_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33415,30 +34484,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-velu_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-velu_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33466,30 +34537,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33517,30 +34590,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vexp_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vexp_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33568,30 +34643,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33619,30 +34696,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vgelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vgelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33670,30 +34749,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33721,30 +34802,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33772,30 +34855,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33826,33 +34911,35 @@ } # This is a target that cannot depend on //base. - source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", - "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", - "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", - "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", + "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", + "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", + "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33880,30 +34967,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33932,31 +35021,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", - "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", + "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -33984,30 +35075,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34035,30 +35128,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsin_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vsin_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34087,31 +35182,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", - "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", + "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34140,31 +35237,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", - "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", + "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34194,32 +35293,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", - "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", - "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", + "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", + "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34248,31 +35349,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-argmaxpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-argmaxpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34301,31 +35404,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34355,32 +35460,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-conv-hwc2chw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-conv-hwc2chw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34423,45 +35530,47 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-aarch64-neonfma-2x4-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-aarch64-neonfma-4x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-aarch64-neonfma-1x4-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-aarch64-neonfma-2x4-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-aarch64-neonfma-4x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-aarch64-neonfma-1x4-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34491,32 +35600,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34561,47 +35672,49 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neon.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neon.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neon.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neon.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neon.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neon.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34631,32 +35744,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34704,50 +35819,52 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc2.S", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc2.S", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34793,48 +35910,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c", - "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c", - "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c", - "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c", - "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c", + "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c", + "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c", + "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c", + "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34864,32 +35983,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear-chw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear-chw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34919,32 +36040,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear/gen/f32-ibilinear-neon-c8.c", - "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-c8.c", - "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear/gen/f32-ibilinear-neon-c8.c", + "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-c8.c", + "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -34991,49 +36114,51 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S", - "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S", - "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S", - "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S", - "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", - "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S", + "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S", + "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S", + "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S", + "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S", + "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35079,48 +36204,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c", - "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c", - "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c", - "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c", - "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c", + "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c", + "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c", + "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c", + "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35149,31 +36276,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-maxpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-maxpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35207,36 +36336,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35268,34 +36399,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35328,35 +36461,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35387,33 +36522,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.c", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.c", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35444,33 +36581,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.c", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.c", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35499,31 +36638,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35554,33 +36695,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-c32.c", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-c32.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-c32.c", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-c32.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35609,31 +36752,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-c16.c", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-c16.c", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35666,35 +36811,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c", - "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c", + "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35723,31 +36870,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c", - "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c", + "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35781,36 +36930,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-spmm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-spmm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c", - "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c", - "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c", - "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c", - "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c", + "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c", + "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c", + "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c", + "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35839,31 +36990,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -35928,67 +37081,69 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c", - "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c", + "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36017,31 +37172,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-neon.c", - "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-neon.c", + "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36070,31 +37227,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c", - "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c", + "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36127,35 +37286,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c", - "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c", + "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36184,31 +37345,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-neon-rational-5-4-div.c", - "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-neon-rational-5-4-div.c", + "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36239,33 +37402,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c", - "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c", - "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c", - "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c", + "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c", + "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c", + "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36294,31 +37459,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-neon-rational-3-2-div.c", - "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-neon-rational-3-2-div.c", + "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36347,31 +37514,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c", - "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c", + "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36400,31 +37569,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-neon.c", - "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-neon.c", + "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36453,31 +37624,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c", - "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c", + "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36506,31 +37679,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c", - "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c", + "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36560,32 +37735,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vmulcaddc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vmulcaddc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neon-2x.c", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neon-2x.c", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36624,41 +37801,43 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c", - "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c", - "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c", - "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c", - "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c", - "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c", - "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c", - "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.c", - "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c", + "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c", + "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c", + "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c", + "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c", + "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c", + "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c", + "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.c", + "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36688,32 +37867,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36743,32 +37924,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36797,31 +37980,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c", - "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c", + "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36850,31 +38035,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c", - "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c", + "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36903,31 +38090,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c", - "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c", + "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -36960,35 +38149,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-neon.c", - "src/src/f32-vunary/gen/f32-vabs-scalar.c", - "src/src/f32-vunary/gen/f32-vneg-neon.c", - "src/src/f32-vunary/gen/f32-vneg-scalar.c", - "src/src/f32-vunary/gen/f32-vsqr-neon.c", - "src/src/f32-vunary/gen/f32-vsqr-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-neon.c", + "src/src/f32-vunary/gen/f32-vabs-scalar.c", + "src/src/f32-vunary/gen/f32-vneg-neon.c", + "src/src/f32-vunary/gen/f32-vneg-scalar.c", + "src/src/f32-vunary/gen/f32-vsqr-neon.c", + "src/src/f32-vunary/gen/f32-vsqr-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37036,50 +38227,52 @@ } # This is a target that cannot depend on //base. - source_set("operators_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("operators_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/operators/argmax-pooling-nhwc.c", - "src/src/operators/average-pooling-nhwc.c", - "src/src/operators/batch-matrix-multiply-nc.c", - "src/src/operators/binary-elementwise-nd.c", - "src/src/operators/constant-pad-nd.c", - "src/src/operators/convolution-nchw.c", - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", - "src/src/operators/reduce-nd.c", - "src/src/operators/resize-bilinear-nchw.c", - "src/src/operators/resize-bilinear-nhwc.c", - "src/src/operators/rope-nthc.c", - "src/src/operators/slice-nd.c", - "src/src/operators/softmax-nc.c", - "src/src/operators/transpose-nd.c", - "src/src/operators/unary-elementwise-nc.c", - "src/src/operators/unpooling-nhwc.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/operators/argmax-pooling-nhwc.c", + "src/src/operators/average-pooling-nhwc.c", + "src/src/operators/batch-matrix-multiply-nc.c", + "src/src/operators/binary-elementwise-nd.c", + "src/src/operators/constant-pad-nd.c", + "src/src/operators/convolution-nchw.c", + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", + "src/src/operators/reduce-nd.c", + "src/src/operators/resize-bilinear-nchw.c", + "src/src/operators/resize-bilinear-nhwc.c", + "src/src/operators/rope-nthc.c", + "src/src/operators/slice-nd.c", + "src/src/operators/softmax-nc.c", + "src/src/operators/transpose-nd.c", + "src/src/operators/unary-elementwise-nc.c", + "src/src/operators/unpooling-nhwc.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37108,31 +38301,33 @@ } # This is a target that cannot depend on //base. - source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", - "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", + "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37161,31 +38356,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { + cflags = [ "-march=armv8.2-a+dotprod+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37214,31 +38411,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37267,31 +38466,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37320,31 +38521,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { + cflags = [ "-march=armv8.2-a+dotprod+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37373,31 +38576,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37426,31 +38631,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37481,33 +38688,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { + cflags = [ "-march=armv8.2-a+dotprod+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37536,31 +38745,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37591,33 +38802,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37646,31 +38859,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37701,33 +38916,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") { + cflags = [ "-march=armv8.2-a+dotprod+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37756,31 +38973,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37811,33 +39030,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37866,31 +39087,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37919,31 +39142,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -37972,31 +39197,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38027,33 +39254,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38082,31 +39311,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38135,31 +39366,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38190,33 +39423,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38247,33 +39482,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38304,33 +39541,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38359,31 +39598,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38415,34 +39656,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c2s4-minmax-neon-mlal.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c2s4-minmax-neon-mlal.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38473,33 +39716,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38530,33 +39775,35 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38585,31 +39832,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38643,36 +39892,38 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8-minmax-neon-mlal-lane.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8-minmax-neon-mlal-lane.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38701,31 +39952,33 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c", - "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x8c16s2-aarch64-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c", + "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x8c16s2-aarch64-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38753,30 +40006,32 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38806,32 +40061,34 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c", - "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c", - "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c", + "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c", + "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38859,30 +40116,32 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38912,32 +40171,34 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c", - "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c", - "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c", + "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c", + "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -38965,30 +40226,32 @@ } # This is a target that cannot depend on //base. - source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39022,36 +40285,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39079,30 +40344,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") { + cflags = [ "-march=armv8.2-a+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39131,31 +40398,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39183,30 +40452,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39237,33 +40508,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S", - "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S", + "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39291,30 +40564,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc4w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc4w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39355,43 +40630,45 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neon-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neon-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neon-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neon-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39422,33 +40699,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39487,41 +40766,43 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39550,31 +40831,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39608,36 +40891,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neon-mlal.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neon-mlal.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39668,33 +40953,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39733,41 +41020,43 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39796,31 +41085,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") { + cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39854,36 +41145,38 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39911,30 +41204,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qu8-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qu8-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -39963,31 +41258,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-c32.c", - "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-c32.c", + "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40015,30 +41312,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+dotprod" ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40067,31 +41366,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c", - "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c", + "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40122,33 +41423,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40179,33 +41482,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40234,31 +41539,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c", - "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c", + "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40287,31 +41594,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40340,31 +41649,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40393,31 +41704,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40445,30 +41758,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vprelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vprelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40496,30 +41811,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vpreluc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vpreluc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40547,30 +41864,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vrpreluc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vrpreluc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40603,35 +41922,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40660,31 +41981,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40717,35 +42040,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", - "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", - "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", - "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40779,36 +42104,38 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", - "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", + "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40841,35 +42168,37 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ "-march=armv8.2-a+fp16+dotprod" ] - asmflags = cflags + asmflags = cflags - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", - "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", - "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", - "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40903,36 +42232,38 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", - "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", - "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", + "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -40962,32 +42293,34 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rdsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rdsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", - "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", - "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", + "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", + "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41016,31 +42349,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", - "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", + "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41071,33 +42406,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41128,33 +42465,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41183,31 +42522,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", - "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", + "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41236,31 +42577,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41289,31 +42632,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41342,31 +42687,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41394,30 +42741,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vprelu_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vprelu_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41445,30 +42794,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vpreluc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vpreluc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41496,30 +42847,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vrpreluc_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vrpreluc_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41549,32 +42902,34 @@ } # This is a target that cannot depend on //base. - source_set("reference_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("reference_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/reference/binary-elementwise.cc", - "src/src/reference/packing.cc", - "src/src/reference/unary-elementwise.cc", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/reference/binary-elementwise.cc", + "src/src/reference/packing.cc", + "src/src/reference/unary-elementwise.cc", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41604,32 +42959,34 @@ } # This is a target that cannot depend on //base. - source_set("s8-ibilinear_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-ibilinear_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-ibilinear/gen/s8-ibilinear-neon-c16.c", - "src/src/s8-ibilinear/gen/s8-ibilinear-neon-c8.c", - "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-ibilinear/gen/s8-ibilinear-neon-c16.c", + "src/src/s8-ibilinear/gen/s8-ibilinear-neon-c8.c", + "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41658,31 +43015,33 @@ } # This is a target that cannot depend on //base. - source_set("s8-maxpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-maxpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", - "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", + "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41713,33 +43072,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-rdminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rdminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-c32.c", - "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", - "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-c32.c", - "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-c32.c", + "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", + "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-c32.c", + "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41772,35 +43133,37 @@ } # This is a target that cannot depend on //base. - source_set("s8-rminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", - "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", - "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", - "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", + "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", + "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", + "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41829,31 +43192,33 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-neon-u64.c", - "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-neon-u64.c", + "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41909,58 +43274,60 @@ } # This is a target that cannot depend on //base. - source_set("subgraph_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("subgraph_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/subgraph/argmax-pooling-2d.c", - "src/src/subgraph/average-pooling-2d.c", - "src/src/subgraph/batch-matrix-multiply.c", - "src/src/subgraph/binary.c", - "src/src/subgraph/concatenate.c", - "src/src/subgraph/convolution-2d.c", - "src/src/subgraph/copy.c", - "src/src/subgraph/deconvolution-2d.c", - "src/src/subgraph/deprecated.c", - "src/src/subgraph/depth-to-space-2d.c", - "src/src/subgraph/depthwise-convolution-2d.c", - "src/src/subgraph/even-split.c", - "src/src/subgraph/fully-connected-sparse.c", - "src/src/subgraph/fully-connected.c", - "src/src/subgraph/max-pooling-2d.c", - "src/src/subgraph/pack-lh.c", - "src/src/subgraph/reshape-helpers.c", - "src/src/subgraph/rope.c", - "src/src/subgraph/softmax.c", - "src/src/subgraph/space-to-depth-2d.c", - "src/src/subgraph/static-constant-pad.c", - "src/src/subgraph/static-reduce.c", - "src/src/subgraph/static-resize-bilinear-2d.c", - "src/src/subgraph/static-slice.c", - "src/src/subgraph/static-transpose.c", - "src/src/subgraph/subgraph-utils.c", - "src/src/subgraph/unary.c", - "src/src/subgraph/unpooling-2d.c", - "src/src/subgraph/validation.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/subgraph/argmax-pooling-2d.c", + "src/src/subgraph/average-pooling-2d.c", + "src/src/subgraph/batch-matrix-multiply.c", + "src/src/subgraph/binary.c", + "src/src/subgraph/concatenate.c", + "src/src/subgraph/convolution-2d.c", + "src/src/subgraph/copy.c", + "src/src/subgraph/deconvolution-2d.c", + "src/src/subgraph/deprecated.c", + "src/src/subgraph/depth-to-space-2d.c", + "src/src/subgraph/depthwise-convolution-2d.c", + "src/src/subgraph/even-split.c", + "src/src/subgraph/fully-connected-sparse.c", + "src/src/subgraph/fully-connected.c", + "src/src/subgraph/max-pooling-2d.c", + "src/src/subgraph/pack-lh.c", + "src/src/subgraph/reshape-helpers.c", + "src/src/subgraph/rope.c", + "src/src/subgraph/softmax.c", + "src/src/subgraph/space-to-depth-2d.c", + "src/src/subgraph/static-constant-pad.c", + "src/src/subgraph/static-reduce.c", + "src/src/subgraph/static-resize-bilinear-2d.c", + "src/src/subgraph/static-slice.c", + "src/src/subgraph/static-transpose.c", + "src/src/subgraph/subgraph-utils.c", + "src/src/subgraph/unary.c", + "src/src/subgraph/unpooling-2d.c", + "src/src/subgraph/validation.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -41996,38 +43363,40 @@ } # This is a target that cannot depend on //base. - source_set("tables_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("tables_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/tables/exp2-k-over-2048.c", - "src/src/tables/exp2-k-over-64.c", - "src/src/tables/exp2minus-k-over-16.c", - "src/src/tables/exp2minus-k-over-2048.c", - "src/src/tables/exp2minus-k-over-32.c", - "src/src/tables/exp2minus-k-over-4.c", - "src/src/tables/exp2minus-k-over-64.c", - "src/src/tables/exp2minus-k-over-8.c", - "src/src/tables/vlog.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/tables/exp2-k-over-2048.c", + "src/src/tables/exp2-k-over-64.c", + "src/src/tables/exp2minus-k-over-16.c", + "src/src/tables/exp2minus-k-over-2048.c", + "src/src/tables/exp2minus-k-over-32.c", + "src/src/tables/exp2minus-k-over-4.c", + "src/src/tables/exp2minus-k-over-64.c", + "src/src/tables/exp2minus-k-over-8.c", + "src/src/tables/vlog.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42057,32 +43426,34 @@ } # This is a target that cannot depend on //base. - source_set("u8-ibilinear_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-ibilinear_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-neon-c16.c", - "src/src/u8-ibilinear/gen/u8-ibilinear-neon-c8.c", - "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-ibilinear/gen/u8-ibilinear-neon-c16.c", + "src/src/u8-ibilinear/gen/u8-ibilinear-neon-c8.c", + "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42110,30 +43481,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-lut32norm_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-lut32norm_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-lut32norm/u8-lut32norm-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-lut32norm/u8-lut32norm-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42162,31 +43535,33 @@ } # This is a target that cannot depend on //base. - source_set("u8-maxpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-maxpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", - "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", + "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42217,33 +43592,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-rdminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rdminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-c32.c", - "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", - "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-c32.c", - "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-c32.c", + "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", + "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-c32.c", + "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42276,35 +43653,37 @@ } # This is a target that cannot depend on //base. - source_set("u8-rminmax_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rminmax_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", - "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", - "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", - "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", + "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", + "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", + "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42333,31 +43712,33 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-neon-u64.c", - "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-neon-u64.c", + "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42386,31 +43767,33 @@ } # This is a target that cannot depend on //base. - source_set("x16-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", - "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", + "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42439,31 +43822,33 @@ } # This is a target that cannot depend on //base. - source_set("x16-transposec_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-transposec_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", - "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", + "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42492,31 +43877,33 @@ } # This is a target that cannot depend on //base. - source_set("x16-x32-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-x32-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42546,32 +43933,34 @@ } # This is a target that cannot depend on //base. - source_set("x24-transposec_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x24-transposec_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", - "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", - "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", + "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", + "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42609,40 +43998,42 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", - "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", - "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", - "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", - "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", - "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", + "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", + "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", + "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", + "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", + "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42672,32 +44063,34 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", - "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", - "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", + "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", + "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42726,31 +44119,33 @@ } # This is a target that cannot depend on //base. - source_set("x32-unpool_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-unpool_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-unpool/x32-unpool-neon.c", - "src/src/x32-unpool/x32-unpool-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-unpool/x32-unpool-neon.c", + "src/src/x32-unpool/x32-unpool-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42780,32 +44175,34 @@ } # This is a target that cannot depend on //base. - source_set("x64-transposec_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x64-transposec_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", - "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", - "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", + "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", + "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42834,31 +44231,33 @@ } # This is a target that cannot depend on //base. - source_set("x8-lut_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-lut_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", - "src/src/x8-lut/gen/x8-lut-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", + "src/src/x8-lut/gen/x8-lut-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42887,31 +44286,33 @@ } # This is a target that cannot depend on //base. - source_set("x8-packq_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packq_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", - "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", + "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42942,33 +44343,35 @@ } # This is a target that cannot depend on //base. - source_set("x8-packw_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packw_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -42997,31 +44400,33 @@ } # This is a target that cannot depend on //base. - source_set("x8-transposec_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-transposec_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", - "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", + "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43049,30 +44454,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-copy_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-copy_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-copy/xx-copy-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-copy/xx-copy-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43101,31 +44508,33 @@ } # This is a target that cannot depend on //base. - source_set("xx-fill_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-fill_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-fill/xx-fill-neon-u64.c", - "src/src/xx-fill/xx-fill-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-fill/xx-fill-neon-u64.c", + "src/src/xx-fill/xx-fill-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43154,31 +44563,33 @@ } # This is a target that cannot depend on //base. - source_set("xx-pad_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-pad_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-pad/xx-pad-p16-neon-u16.c", - "src/src/xx-pad/xx-pad-p4-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-pad/xx-pad-p16-neon-u16.c", + "src/src/xx-pad/xx-pad-p4-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43206,30 +44617,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-transposev_arm64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-transposev_arm64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } } @@ -43282,53 +44695,55 @@ } # This is a target that cannot depend on //base. - source_set("configs_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("configs_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/configs/argmaxpool-config.c", - "src/src/configs/avgpool-config.c", - "src/src/configs/binary-elementwise-config.c", - "src/src/configs/cmul-config.c", - "src/src/configs/conv-hwc2chw-config.c", - "src/src/configs/dwconv-config.c", - "src/src/configs/dwconv2d-chw-config.c", - "src/src/configs/gemm-config.c", - "src/src/configs/hardware-config.c", - "src/src/configs/ibilinear-chw-config.c", - "src/src/configs/ibilinear-config.c", - "src/src/configs/lut32norm-config.c", - "src/src/configs/maxpool-config.c", - "src/src/configs/pack-lh-config.c", - "src/src/configs/raddstoreexpminusmax-config.c", - "src/src/configs/reduce-config.c", - "src/src/configs/spmm-config.c", - "src/src/configs/transpose-config.c", - "src/src/configs/unary-elementwise-config.c", - "src/src/configs/unpool-config.c", - "src/src/configs/vmulcaddc-config.c", - "src/src/configs/x8-lut-config.c", - "src/src/configs/xx-fill-config.c", - "src/src/configs/xx-pad-config.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/configs/argmaxpool-config.c", + "src/src/configs/avgpool-config.c", + "src/src/configs/binary-elementwise-config.c", + "src/src/configs/cmul-config.c", + "src/src/configs/conv-hwc2chw-config.c", + "src/src/configs/dwconv-config.c", + "src/src/configs/dwconv2d-chw-config.c", + "src/src/configs/gemm-config.c", + "src/src/configs/hardware-config.c", + "src/src/configs/ibilinear-chw-config.c", + "src/src/configs/ibilinear-config.c", + "src/src/configs/lut32norm-config.c", + "src/src/configs/maxpool-config.c", + "src/src/configs/pack-lh-config.c", + "src/src/configs/raddstoreexpminusmax-config.c", + "src/src/configs/reduce-config.c", + "src/src/configs/spmm-config.c", + "src/src/configs/transpose-config.c", + "src/src/configs/unary-elementwise-config.c", + "src/src/configs/unpool-config.c", + "src/src/configs/vmulcaddc-config.c", + "src/src/configs/x8-lut-config.c", + "src/src/configs/xx-fill-config.c", + "src/src/configs/xx-pad-config.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43360,34 +44775,36 @@ } # This is a target that cannot depend on //base. - source_set("enums_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("enums_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/enums/allocation-type.c", - "src/src/enums/datatype-strings.c", - "src/src/enums/microkernel-type.c", - "src/src/enums/node-type.c", - "src/src/enums/operator-type.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/enums/allocation-type.c", + "src/src/enums/datatype-strings.c", + "src/src/enums/microkernel-type.c", + "src/src/enums/node-type.c", + "src/src/enums/operator-type.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43415,30 +44832,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-f32-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-f32-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43466,30 +44885,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qs8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qs8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43517,30 +44938,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-qu8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-qu8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43569,31 +44992,33 @@ } # This is a target that cannot depend on //base. - source_set("f16-rdminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rdminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", - "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-c2.c", + "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43623,32 +45048,34 @@ } # This is a target that cannot depend on //base. - source_set("f16-rminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-rminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", - "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", + "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43676,30 +45103,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vapproxgelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vapproxgelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43727,30 +45156,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vcos_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vcos_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43778,30 +45209,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vexp_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vexp_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43829,30 +45262,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vgelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vgelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43880,30 +45315,32 @@ } # This is a target that cannot depend on //base. - source_set("f16-vsin_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f16-vsin_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43934,33 +45371,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -43988,30 +45427,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-argmaxpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-argmaxpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44039,30 +45480,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-avgpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-avgpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44093,33 +45536,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44147,30 +45592,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-conv-hwc2chw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-conv-hwc2chw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44202,34 +45649,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44264,37 +45713,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv2d-chw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv2d-chw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", + "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44332,40 +45783,42 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44402,39 +45855,41 @@ } # This is a target that cannot depend on //base. - source_set("f32-dwconv_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-dwconv_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", - "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", + "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44462,30 +45917,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-f16-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-f16-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44517,34 +45974,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", - "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", + "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44579,37 +46038,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", - "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", + "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44637,30 +46098,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear-chw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear-chw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44688,30 +46151,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-ibilinear_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-ibilinear_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44743,34 +46208,36 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", - "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", + "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44805,37 +46272,39 @@ } # This is a target that cannot depend on //base. - source_set("f32-igemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-igemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", - "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", + "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44866,33 +46335,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44920,30 +46391,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-maxpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-maxpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -44972,31 +46445,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc4w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc4w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45025,31 +46500,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qc8w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qc8w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45080,33 +46557,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45135,31 +46614,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qs8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qs8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45190,33 +46671,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45245,31 +46728,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-qu8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-qu8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", - "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", + "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45300,33 +46785,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45354,30 +46841,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-raddstoreexpminusmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-raddstoreexpminusmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45406,31 +46895,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", - "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-c2.c", + "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45461,33 +46952,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45515,30 +47008,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rdsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rdsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45571,35 +47066,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", - "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", - "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", + "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", + "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45629,32 +47126,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-rminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", - "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", + "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45682,30 +47181,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-rsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-rsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45738,35 +47239,37 @@ } # This is a target that cannot depend on //base. - source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", - "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", - "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", + "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", + "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45796,32 +47299,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-spmm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-spmm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", - "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", + "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45849,30 +47354,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vapproxgelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vapproxgelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -45918,48 +47425,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", - "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", + "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46005,48 +47514,50 @@ } # This is a target that cannot depend on //base. - source_set("f32-vbinary_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vbinary_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", - "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", - "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", + "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", + "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46074,30 +47585,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vclamp_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vclamp_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vclamp/gen/f32-vclamp-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46128,33 +47641,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46182,30 +47697,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcmul_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcmul_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46235,32 +47752,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcopysign_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcopysign_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", - "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", - "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", + "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", + "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46288,30 +47807,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vcos_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vcos_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46339,30 +47860,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-velu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-velu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46390,30 +47913,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vexp_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vexp_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46441,30 +47966,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vgelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vgelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46495,33 +48022,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46549,30 +48078,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vhswish_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vhswish/gen/f32-vhswish-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46600,30 +48131,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlog_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlog_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46654,33 +48187,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46708,30 +48243,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vlrelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46759,30 +48296,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vmulcaddc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vmulcaddc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46816,36 +48355,38 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", - "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", - "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", - "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", + "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", + "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", + "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46876,33 +48417,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrnd_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrnd_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", - "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", + "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46933,33 +48476,35 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -46988,31 +48533,33 @@ } # This is a target that cannot depend on //base. - source_set("f32-vrsqrt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vrsqrt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", - "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47040,30 +48587,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsigmoid_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsigmoid_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47091,30 +48640,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsin_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsin_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47142,30 +48693,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vsqrt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vsqrt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47193,30 +48746,32 @@ } # This is a target that cannot depend on //base. - source_set("f32-vtanh_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vtanh_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47246,32 +48801,34 @@ } # This is a target that cannot depend on //base. - source_set("f32-vunary_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("f32-vunary_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/f32-vunary/gen/f32-vabs-scalar.c", - "src/src/f32-vunary/gen/f32-vneg-scalar.c", - "src/src/f32-vunary/gen/f32-vsqr-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/f32-vunary/gen/f32-vabs-scalar.c", + "src/src/f32-vunary/gen/f32-vneg-scalar.c", + "src/src/f32-vunary/gen/f32-vsqr-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47319,50 +48876,52 @@ } # This is a target that cannot depend on //base. - source_set("operators_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("operators_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/operators/argmax-pooling-nhwc.c", - "src/src/operators/average-pooling-nhwc.c", - "src/src/operators/batch-matrix-multiply-nc.c", - "src/src/operators/binary-elementwise-nd.c", - "src/src/operators/constant-pad-nd.c", - "src/src/operators/convolution-nchw.c", - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", - "src/src/operators/reduce-nd.c", - "src/src/operators/resize-bilinear-nchw.c", - "src/src/operators/resize-bilinear-nhwc.c", - "src/src/operators/rope-nthc.c", - "src/src/operators/slice-nd.c", - "src/src/operators/softmax-nc.c", - "src/src/operators/transpose-nd.c", - "src/src/operators/unary-elementwise-nc.c", - "src/src/operators/unpooling-nhwc.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/operators/argmax-pooling-nhwc.c", + "src/src/operators/average-pooling-nhwc.c", + "src/src/operators/batch-matrix-multiply-nc.c", + "src/src/operators/binary-elementwise-nd.c", + "src/src/operators/constant-pad-nd.c", + "src/src/operators/convolution-nchw.c", + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", + "src/src/operators/reduce-nd.c", + "src/src/operators/resize-bilinear-nchw.c", + "src/src/operators/resize-bilinear-nhwc.c", + "src/src/operators/rope-nthc.c", + "src/src/operators/slice-nd.c", + "src/src/operators/softmax-nc.c", + "src/src/operators/transpose-nd.c", + "src/src/operators/unary-elementwise-nc.c", + "src/src/operators/unpooling-nhwc.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47391,31 +48950,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qb4w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qb4w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47447,34 +49008,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47503,31 +49066,33 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc4w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc4w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47559,34 +49124,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47616,32 +49183,34 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47673,34 +49242,36 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47730,32 +49301,34 @@ } # This is a target that cannot depend on //base. - source_set("qd8-f32-qc8w-igemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47787,34 +49360,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47845,33 +49420,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-dwconv_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47902,33 +49479,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -47956,30 +49535,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-f32-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-f32-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48007,30 +49588,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-packw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-packw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48058,30 +49641,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc4w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc4w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc4w-gemm/qs8-qc4w-gemm-1x2-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48114,35 +49699,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48175,35 +49762,37 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-dwconv_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-dwconv_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48235,34 +49824,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48291,31 +49882,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48347,34 +49940,36 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48403,31 +49998,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qc8w-igemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qc8w-igemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48455,30 +50052,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-qu8-packw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-qu8-packw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48509,33 +50108,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48563,30 +50164,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rdsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rdsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48617,33 +50220,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48671,30 +50276,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-rsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-rsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48725,33 +50332,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48780,31 +50389,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vadd_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vadd_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", + "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48835,33 +50446,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48890,31 +50503,33 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vaddc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vaddc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", - "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", + "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48942,30 +50557,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -48996,33 +50613,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49050,30 +50669,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vlrelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vlrelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49104,33 +50725,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49158,30 +50781,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmul_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmul_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49212,33 +50837,35 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49266,30 +50893,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vmulc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vmulc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49317,30 +50946,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vprelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vprelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49368,30 +50999,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vpreluc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vpreluc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49419,30 +51052,32 @@ } # This is a target that cannot depend on //base. - source_set("qs8-vrpreluc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qs8-vrpreluc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49474,34 +51109,36 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49532,33 +51169,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-dwconv_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", - "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", + "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49589,33 +51228,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49643,30 +51284,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-f32-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49695,31 +51338,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-gemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-gemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49748,31 +51393,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-igemm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", - "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", + "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49803,33 +51450,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49857,30 +51506,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rdsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rdsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49911,33 +51562,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -49965,30 +51618,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-rsum_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-rsum_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50019,33 +51674,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50074,31 +51731,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vadd_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vadd_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", - "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", + "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50129,33 +51788,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50184,31 +51845,33 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vaddc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vaddc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", + "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50236,30 +51899,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vcvt_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vcvt_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50290,33 +51955,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50344,30 +52011,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vlrelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vlrelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50398,33 +52067,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50452,30 +52123,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmul_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50506,33 +52179,35 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50560,30 +52235,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vmulc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vmulc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50611,30 +52288,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vprelu_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vprelu_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50662,30 +52341,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vpreluc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vpreluc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50713,30 +52394,32 @@ } # This is a target that cannot depend on //base. - source_set("qu8-vrpreluc_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("qu8-vrpreluc_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50766,32 +52449,34 @@ } # This is a target that cannot depend on //base. - source_set("reference_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("reference_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/reference/binary-elementwise.cc", - "src/src/reference/packing.cc", - "src/src/reference/unary-elementwise.cc", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/reference/binary-elementwise.cc", + "src/src/reference/packing.cc", + "src/src/reference/unary-elementwise.cc", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50819,30 +52504,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-ibilinear_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-ibilinear_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50870,30 +52557,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-maxpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-maxpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50922,31 +52611,33 @@ } # This is a target that cannot depend on //base. - source_set("s8-rdminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rdminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", - "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-c2.c", + "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -50976,32 +52667,34 @@ } # This is a target that cannot depend on //base. - source_set("s8-rminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-rminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", - "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", + "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51032,33 +52725,35 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51086,30 +52781,32 @@ } # This is a target that cannot depend on //base. - source_set("s8-vclamp_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("s8-vclamp_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51165,58 +52862,60 @@ } # This is a target that cannot depend on //base. - source_set("subgraph_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("subgraph_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/subgraph/argmax-pooling-2d.c", - "src/src/subgraph/average-pooling-2d.c", - "src/src/subgraph/batch-matrix-multiply.c", - "src/src/subgraph/binary.c", - "src/src/subgraph/concatenate.c", - "src/src/subgraph/convolution-2d.c", - "src/src/subgraph/copy.c", - "src/src/subgraph/deconvolution-2d.c", - "src/src/subgraph/deprecated.c", - "src/src/subgraph/depth-to-space-2d.c", - "src/src/subgraph/depthwise-convolution-2d.c", - "src/src/subgraph/even-split.c", - "src/src/subgraph/fully-connected-sparse.c", - "src/src/subgraph/fully-connected.c", - "src/src/subgraph/max-pooling-2d.c", - "src/src/subgraph/pack-lh.c", - "src/src/subgraph/reshape-helpers.c", - "src/src/subgraph/rope.c", - "src/src/subgraph/softmax.c", - "src/src/subgraph/space-to-depth-2d.c", - "src/src/subgraph/static-constant-pad.c", - "src/src/subgraph/static-reduce.c", - "src/src/subgraph/static-resize-bilinear-2d.c", - "src/src/subgraph/static-slice.c", - "src/src/subgraph/static-transpose.c", - "src/src/subgraph/subgraph-utils.c", - "src/src/subgraph/unary.c", - "src/src/subgraph/unpooling-2d.c", - "src/src/subgraph/validation.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/subgraph/argmax-pooling-2d.c", + "src/src/subgraph/average-pooling-2d.c", + "src/src/subgraph/batch-matrix-multiply.c", + "src/src/subgraph/binary.c", + "src/src/subgraph/concatenate.c", + "src/src/subgraph/convolution-2d.c", + "src/src/subgraph/copy.c", + "src/src/subgraph/deconvolution-2d.c", + "src/src/subgraph/deprecated.c", + "src/src/subgraph/depth-to-space-2d.c", + "src/src/subgraph/depthwise-convolution-2d.c", + "src/src/subgraph/even-split.c", + "src/src/subgraph/fully-connected-sparse.c", + "src/src/subgraph/fully-connected.c", + "src/src/subgraph/max-pooling-2d.c", + "src/src/subgraph/pack-lh.c", + "src/src/subgraph/reshape-helpers.c", + "src/src/subgraph/rope.c", + "src/src/subgraph/softmax.c", + "src/src/subgraph/space-to-depth-2d.c", + "src/src/subgraph/static-constant-pad.c", + "src/src/subgraph/static-reduce.c", + "src/src/subgraph/static-resize-bilinear-2d.c", + "src/src/subgraph/static-slice.c", + "src/src/subgraph/static-transpose.c", + "src/src/subgraph/subgraph-utils.c", + "src/src/subgraph/unary.c", + "src/src/subgraph/unpooling-2d.c", + "src/src/subgraph/validation.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51252,38 +52951,40 @@ } # This is a target that cannot depend on //base. - source_set("tables_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("tables_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/tables/exp2-k-over-2048.c", - "src/src/tables/exp2-k-over-64.c", - "src/src/tables/exp2minus-k-over-16.c", - "src/src/tables/exp2minus-k-over-2048.c", - "src/src/tables/exp2minus-k-over-32.c", - "src/src/tables/exp2minus-k-over-4.c", - "src/src/tables/exp2minus-k-over-64.c", - "src/src/tables/exp2minus-k-over-8.c", - "src/src/tables/vlog.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/tables/exp2-k-over-2048.c", + "src/src/tables/exp2-k-over-64.c", + "src/src/tables/exp2minus-k-over-16.c", + "src/src/tables/exp2minus-k-over-2048.c", + "src/src/tables/exp2minus-k-over-32.c", + "src/src/tables/exp2minus-k-over-4.c", + "src/src/tables/exp2minus-k-over-64.c", + "src/src/tables/exp2minus-k-over-8.c", + "src/src/tables/vlog.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51311,30 +53012,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-ibilinear_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-ibilinear_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-c1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51362,30 +53065,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-lut32norm_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-lut32norm_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-lut32norm/u8-lut32norm-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-lut32norm/u8-lut32norm-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51413,30 +53118,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-maxpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-maxpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51465,31 +53172,33 @@ } # This is a target that cannot depend on //base. - source_set("u8-rdminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rdminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", - "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-c2.c", + "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-c2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51519,32 +53228,34 @@ } # This is a target that cannot depend on //base. - source_set("u8-rminmax_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-rminmax_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", - "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", + "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51575,33 +53286,35 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51629,30 +53342,32 @@ } # This is a target that cannot depend on //base. - source_set("u8-vclamp_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("u8-vclamp_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/u8-vclamp/u8-vclamp-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51680,30 +53395,32 @@ } # This is a target that cannot depend on //base. - source_set("x16-transposec_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-transposec_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51732,31 +53449,33 @@ } # This is a target that cannot depend on //base. - source_set("x16-x32-packw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x16-x32-packw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", - "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", + "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51784,30 +53503,32 @@ } # This is a target that cannot depend on //base. - source_set("x24-transposec_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x24-transposec_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51838,33 +53559,35 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51897,35 +53620,37 @@ } # This is a target that cannot depend on //base. - source_set("x32-packw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-packw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", - "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", - "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", + "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", + "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -51959,36 +53684,38 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") { - cflags = [ - "-mabi=lp64d", - "-march=rv64gcv", - ] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv", + ] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c", - "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c", - "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c", - "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c", + "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c", + "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c", + "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52016,30 +53743,32 @@ } # This is a target that cannot depend on //base. - source_set("x32-transposec_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-transposec_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52067,30 +53796,32 @@ } # This is a target that cannot depend on //base. - source_set("x32-unpool_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x32-unpool_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x32-unpool/x32-unpool-scalar.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x32-unpool/x32-unpool-scalar.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52118,30 +53849,32 @@ } # This is a target that cannot depend on //base. - source_set("x64-transposec_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x64-transposec_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52169,30 +53902,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-lut_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-lut_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-lut/gen/x8-lut-scalar-u4.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-lut/gen/x8-lut-scalar-u4.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52220,30 +53955,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-packq_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packq_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52274,33 +54011,35 @@ } # This is a target that cannot depend on //base. - source_set("x8-packw_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-packw_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", - "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", + "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52328,30 +54067,32 @@ } # This is a target that cannot depend on //base. - source_set("x8-transposec_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("x8-transposec_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52379,30 +54120,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-copy_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-copy_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-copy/xx-copy-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-copy/xx-copy-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52430,30 +54173,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-fill_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-fill_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-fill/xx-fill-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-fill/xx-fill-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52481,30 +54226,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-pad_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-pad_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-pad/xx-pad-p4-scalar-u16.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-pad/xx-pad-p4-scalar-u16.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } @@ -52532,30 +54279,32 @@ } # This is a target that cannot depend on //base. - source_set("xx-transposev_riscv64_standalone") { - cflags = [] + if (build_with_internal_optimization_guide) { + source_set("xx-transposev_riscv64_standalone") { + cflags = [] - sources = [ - "src/include/xnnpack.h", - "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", - ] + sources = [ + "src/include/xnnpack.h", + "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c", + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } }
diff --git a/third_party/xnnpack/generate_build_gn.py b/third_party/xnnpack/generate_build_gn.py index 35a7699..7b9a8c1b 100644 --- a/third_party/xnnpack/generate_build_gn.py +++ b/third_party/xnnpack/generate_build_gn.py
@@ -59,6 +59,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # import("//build/config/android/config.gni") +import("//components/optimization_guide/features.gni") import("//third_party/xnnpack/build_defs.gni") config("xnnpack_public_config") { @@ -115,31 +116,33 @@ } # This is a target that cannot depend on //base. -source_set("xnnpack_standalone") { - public = [ "src/include/xnnpack.h" ] +if (build_with_internal_optimization_guide) { + source_set("xnnpack_standalone") { + public = [ "src/include/xnnpack.h" ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - sources = [ - "src/include/xnnpack.h", - "build_identifier.c", -%SRCS% - ] + sources = [ + "src/include/xnnpack.h", + "build_identifier.c", + %SRCS% + ] - deps = xnnpack_standalone_deps + [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = xnnpack_standalone_deps + [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } '''.strip() @@ -171,32 +174,34 @@ } # This is a target that cannot depend on //base. -source_set("%TARGET_NAME%_standalone") { - cflags = [ -%CFLAGS% - ] -%ASMFLAGS% - sources = [ - "src/include/xnnpack.h", -%SRCS% - ] +if (build_with_internal_optimization_guide) { + source_set("%TARGET_NAME%_standalone") { + cflags = [ + %CFLAGS% + ] + %ASMFLAGS% + sources = [ + "src/include/xnnpack.h", + %SRCS% + ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool:pthreadpool_standalone", - ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] + } } } '''.strip() @@ -454,14 +459,18 @@ {xnnpack_deps} ] - xnnpack_standalone_deps = [ + if (build_with_internal_optimization_guide) { + xnnpack_standalone_deps = [ {xnnpack_standalone_deps} - ] + ] + } ''' deps_list += '} else {\n' deps_list += ' xnnpack_deps = []\n' - deps_list += ' xnnpack_standalone_deps = []\n' - deps_list += '}' + deps_list += ' if (build_with_internal_optimization_guide) {\n' + deps_list += ' xnnpack_standalone_deps = []\n' + deps_list += ' }\n' + deps_list += '}\n' return deps_list
diff --git a/tools/json_schema_compiler/test/web_idl/preceding_extended_attributes.idl b/tools/json_schema_compiler/test/web_idl/preceding_extended_attributes.idl index ceb5c1c..de698f7 100644 --- a/tools/json_schema_compiler/test/web_idl/preceding_extended_attributes.idl +++ b/tools/json_schema_compiler/test/web_idl/preceding_extended_attributes.idl
@@ -6,8 +6,10 @@ [nodoc] interface PrecedingExtendedAttributes { - // Blank for now. - // TODO(crbug.com/340297705): Add similar here for functions. + // Description on a function. + // |Returns|: Promise return description. + [requiredCallback] + static Promise<boolean> functionExample(); }; partial interface Browser {
diff --git a/tools/json_schema_compiler/web_idl_schema.py b/tools/json_schema_compiler/web_idl_schema.py index 9da3c9f..27631f7 100755 --- a/tools/json_schema_compiler/web_idl_schema.py +++ b/tools/json_schema_compiler/web_idl_schema.py
@@ -123,12 +123,6 @@ greater than zero. """ - # The IDL parser doesn't annotate Operation nodes with their line number - # correctly, but the Arguments child node will have the correct line number, - # so use that instead. - if node.GetClass() == 'Operation': - return _ExtractNodeComment(node.GetOneOf('Arguments')) - # Extended attributes for a node can actually be formatted onto a preceding # line, so if this node has an extended attribute we instead look for the # description relative to the extended attribute node. @@ -136,6 +130,14 @@ if ext_attribute_node is not None: return _ExtractNodeComment(ext_attribute_node) + # The IDL parser doesn't annotate Operation nodes with their line number + # correctly, but the Arguments child node will have the correct line number, + # so use that instead. + # Note: If the Operation node had any extended attributes, it will have + # already been handled by the conditional before this one. + if node.GetClass() == 'Operation': + return _ExtractNodeComment(node.GetOneOf('Arguments')) + # Look through the lines above the current node and extract every consecutive # line that is a comment until a blank or non-comment line is found. filename, line_number = node.GetFileAndLine()
diff --git a/tools/json_schema_compiler/web_idl_schema_test.py b/tools/json_schema_compiler/web_idl_schema_test.py index 3eb918e..e07e68eb 100755 --- a/tools/json_schema_compiler/web_idl_schema_test.py +++ b/tools/json_schema_compiler/web_idl_schema_test.py
@@ -402,7 +402,6 @@ self.assertEqual('Description for the returns object itself.', return_function_returns_value.get('description')) - # Tests that API events are processed as expected. def testEvents(self): schema = self.idl_basics @@ -696,8 +695,6 @@ # Tests that extended attributes being listed on the the line previous to a # node come through correctly and don't throw off and associated descriptions. - # TODO(crbug.com/340297705): Add checks for functions here once support for - # processing their descriptions is complete. def testPreviousLineExtendedAttributes(self): idl = web_idl_schema.Load('test/web_idl/preceding_extended_attributes.idl') self.assertEqual(1, len(idl)) @@ -709,6 +706,15 @@ schema['description'], ) + function = getFunction(schema, 'functionExample') + self.assertEqual('Description on a function.', function.get('description')) + async_return = getFunctionAsyncReturn(schema, 'functionExample') + # The extended attribute on the function causes 'optional': True to not be + # present on the async return. + self.assertNotIn('optional', async_return) + self.assertEqual('Promise return description.', + async_return.get('description')) + # Tests that an API interface with the platforms extended attribute has these # values in a platforms attribute after processing. def testAllPlatformsOnNamespace(self):
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index f66f27ee..2b9a965 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -9055,6 +9055,7 @@ <int value="-1846471618" label="enable-experimental-accessibility-switch-access-text"/> <int value="-1846070594" label="AllowWindowDragUsingSystemDragDrop:disabled"/> + <int value="-1845853407" label="FacilitatedPaymentsEnableA2APayment:enabled"/> <int value="-1845410561" label="EnableNtpBrowserPromos:disabled"/> <int value="-1844754731" label="Mash:disabled"/> <int value="-1844445413" @@ -9916,6 +9917,9 @@ <int value="-1520645293" label="InterestFeedNoticeCardAutoDismiss:disabled"/> <int value="-1520630395" label="DefaultPassthroughCommandDecoder:disabled"/> <int value="-1520542714" label="AccessibilityManifestV3GoogleTts:enabled"/> + <int value="-1519741393" + label="AutofillEnableBuyNowPayLaterForExternallyLinkedKlarna:enabled"/> + <int value="-1519536015" label="enable-hls-playback:disabled"/> <int value="-1517929127" label="DelegatedCompositing:enabled"/> <int value="-1517518406" label="force-update-menu-type"/> <int value="-1516955483" label="AutoDisableAccessibility:enabled"/> @@ -10713,8 +10717,6 @@ <int value="-1229882308" label="DesktopPWAsTabStripCustomizations:disabled"/> <int value="-1229114522" label="ClearCrossSiteCrossBrowsingContextGroupWindowName:disabled"/> - <int value="-1229101944" - label="kFacilitatedPaymentsEnableA2APayment:disabled"/> <int value="-1228782289" label="EventPath:disabled"/> <int value="-1228546373" label="UseLookalikesForNavigationSuggestions:enabled"/> @@ -13378,7 +13380,6 @@ <int value="-234966279" label="PointerEvent:disabled"/> <int value="-234687894" label="NonValidatingReloadOnRefreshContentV2:disabled"/> - <int value="-234442660" label="CollaborationAutomotive:disabled"/> <int value="-234231190" label="SharingDeviceRegistration:enabled"/> <int value="-233334129" label="BiometricTouchToFill:disabled"/> <int value="-232769318" label="EventBasedLogUpload:disabled"/> @@ -14104,7 +14105,6 @@ <int value="36536806" label="FilterWebsitesForSupervisedUsersOnDesktopAndIOS:disabled"/> <int value="37024318" label="disable-affiliation-based-matching"/> - <int value="37490013" label="CollaborationAutomotive:enabled"/> <int value="38213894" label="PrivacySettingsRedesign:enabled"/> <int value="38904620" label="TabSwitcherLongpressMenu:enabled"/> <int value="39035791" @@ -16509,7 +16509,6 @@ <int value="937305086" label="EnableBoundSessionCredentials:enabled"/> <int value="937557884" label="PostQuantumKyber:disabled"/> <int value="938191241" label="VrShell:enabled"/> - <int value="938459636" label="kFacilitatedPaymentsEnableA2APayment:enabled"/> <int value="939050961" label="OnTheFlyMhtmlHashComputation:disabled"/> <int value="939366135" label="DownloadsLocationChange:disabled"/> <int value="939554480" label="enable-credit-card-scan"/> @@ -17597,6 +17596,7 @@ <int value="1328943848" label="EnterpriseFileObfuscation:disabled"/> <int value="1330264457" label="OmniboxUIExperimentVerticalLayout:disabled"/> <int value="1330592192" label="FedCmLightweightMode:enabled"/> + <int value="1330600806" label="enable-hls-playback:enabled"/> <int value="1331098784" label="ReducedReferrerGranularity:enabled"/> <int value="1332120969" label="ChromeDuet:disabled"/> <int value="1332891404" @@ -17731,6 +17731,7 @@ <int value="1383526461" label="QuickAnswersRichUi:enabled"/> <int value="1383591631" label="enable-gesture-typing"/> <int value="1384102751" label="AutofillParseIBANFields:enabled"/> + <int value="1384195698" label="FacilitatedPaymentsEnableA2APayment:disabled"/> <int value="1384614036" label="disable-unified-media-pipeline"/> <int value="1385652312" label="ThirdPartyProfileManagement:enabled"/> <int value="1385833812" label="WinrtGeolocationImplementation:disabled"/> @@ -18596,6 +18597,8 @@ <int value="1697189972" label="WebPaymentsSingleAppUiSkip:disabled"/> <int value="1697576315" label="ZeroSuggestPrefetchingOnWeb:enabled"/> <int value="1698089268" label="WebXRMultiGpu:disabled"/> + <int value="1698093940" + label="AutofillEnableBuyNowPayLaterForExternallyLinkedKlarna:disabled"/> <int value="1699134522" label="LensFullscreenSearch:enabled"/> <int value="1699180023" label="PaymentRequestOptionalTotal:disabled"/> <int value="1699182601" label="DockedMagnifier:disabled"/>
diff --git a/tools/metrics/histograms/metadata/arc/histograms.xml b/tools/metrics/histograms/metadata/arc/histograms.xml index 81c73c3d..31cfc61 100644 --- a/tools/metrics/histograms/metadata/arc/histograms.xml +++ b/tools/metrics/histograms/metadata/arc/histograms.xml
@@ -230,45 +230,46 @@ </variants> <histogram name="Arc.AbiMigration.BootTime" units="ms" - expires_after="2024-12-08"> + expires_after="2026-07-08"> <owner>vraheja@chromium.org</owner> <owner>arc-core@google.com</owner> <summary> Time taken for ARC to boot during an Abi Migration event. Warning: this - histogram was expired from 08/04/2022 to 07/12/2023; data may be missing. + histogram was expired from 08/04/2022 to 07/12/2023; then from 12/08/2024 to + 07/01/2025; data may be missing. </summary> </histogram> <histogram name="Arc.AbiMigration.DowngradeDelay" units="ms" - expires_after="2024-09-15"> + expires_after="2026-07-15"> <owner>vraheja@chromium.org</owner> <owner>arc-core@google.com</owner> <summary> Time taken by ArcAbiMigrationService specifically to downgrade system packages. Warning: this histogram was expired from 08/04/2022 to 07/12/2023; - data may be missing. + then from 09/15/2024 to 07/01/2025; data may be missing. </summary> </histogram> <histogram name="Arc.AbiMigration.Event" enum="ArcCorePriAbiMigEvent" - expires_after="2024-09-15"> + expires_after="2026-07-01"> <owner>vraheja@google.com</owner> <owner>arc-core@google.com</owner> <summary> Records event type for ArcAbiMigrationService during Abi Migration. Warning: - this histogram was expired from 08/04/2022 to 07/12/2023; data may be - missing. + this histogram was expired from 08/04/2022 to 07/12/2023, from 09/15/2024 to + 07/01/2025; data may be missing. </summary> </histogram> <histogram name="Arc.AbiMigration.FailedAttempts" units="units" - expires_after="2024-07-13"> + expires_after="2026-07-13"> <owner>vraheja@chromium.org</owner> <owner>arc-core@google.com</owner> <summary> Records the number of failed attempts in trying to perform Primary Abi Migration. Warning: this histogram was expired from 08/04/2022 to - 07/12/2023; data may be missing. + 07/12/2023, from 07/13/2024 to 07/01/2025; data may be missing. </summary> </histogram> @@ -608,7 +609,7 @@ </histogram> <histogram name="Arc.AppsInstalledAtStartup" units="App Count" - expires_after="2024-07-11"> + expires_after="2026-07-11"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -618,7 +619,8 @@ Warning: this histogram was expired after M92 and brought back 2021-09-17; expired after M99 and brought back 2022-12-07, then expired after M114 and - brought back 2023-07-11; data may be missing. + brought back 2023-07-11; then from 2024-07-11 to 2025-07-01; data may be + missing. </summary> </histogram> @@ -756,13 +758,14 @@ </histogram> <histogram name="Arc.Auth.MainAccountHashMigration.Status" - enum="ArcMainAccountHashMigrationStatus" expires_after="2024-09-11"> + enum="ArcMainAccountHashMigrationStatus" expires_after="2026-07-01"> <owner>vsomani@google.com</owner> <owner>arc-core@google.com</owner> <summary> Contains the status of the main account hash migration resolution. We record this metric when migrating the main account hash from java hashcode to use a - cryptographic hash. This is done at the bootup time. + cryptographic hash. This is done at the bootup time. Warning: this histogram + was expired from 2024-09-11 to 2025-07-01; data may be missing. </summary> </histogram> @@ -791,22 +794,24 @@ <token key="ArcUserTypes" variants="ArcUserTypes"/> </histogram> -<histogram name="Arc.Auth.NumAccounts" units="count" expires_after="2025-01-12"> +<histogram name="Arc.Auth.NumAccounts" units="count" expires_after="2026-01-12"> <owner>sinhak@google.com</owner> <owner>arc-core@google.com</owner> <summary> Tracks the number of accounts in ARC. This is recorded only once per - session, at login time. + session, at login time. Warning: this histogram was expired from 2025-01-12 + to 2025-07-01; data may be missing. </summary> </histogram> -<histogram name="Arc.Auth.PercentAccounts" units="%" expires_after="2024-09-11"> +<histogram name="Arc.Auth.PercentAccounts" units="%" expires_after="2026-07-11"> <owner>sinhak@google.com</owner> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> Tracks the percentage of the accounts in session that are also available in - ARC. This is recorded only once per session, at login time. + ARC. This is recorded only once per session, at login time. Warning: this + histogram was expired from 2024-09-11 to 2025-07-01; data may be missing. </summary> </histogram> @@ -860,7 +865,7 @@ <histogram name="Arc.CloudDpc{TimedCloudDpcOp}.TimeDelta{SuccessFailure}{ArcUserTypes}" - units="ms" expires_after="2025-12-21"> + units="ms" expires_after="2026-06-15"> <owner>batoon@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -873,7 +878,7 @@ </histogram> <histogram name="Arc.CompanionLibraryApisCounter" - enum="CompanionLibraryApisList" expires_after="2025-07-13"> + enum="CompanionLibraryApisList" expires_after="2026-07-13"> <owner>sstan@google.com</owner> <owner>preranap@google.com</owner> <owner>arc-commercial@google.com</owner> @@ -1421,7 +1426,7 @@ </histogram> <histogram name="Arc.KeyMint.KeyMintError" enum="ArcKeyMintError" - expires_after="2025-11-30"> + expires_after="2026-05-18"> <owner>yaohuali@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -1431,7 +1436,7 @@ </histogram> <histogram name="Arc.KeyMint.KeyMintError.{ArcKeyMintLoggedOperation}" - enum="ArcKeyMintError" expires_after="2025-10-05"> + enum="ArcKeyMintError" expires_after="2026-06-02"> <owner>batoon@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -1627,7 +1632,7 @@ </histogram> <histogram name="Arc.Net.DnsQuery.AndroidApi" enum="BooleanSuccess" - expires_after="2025-11-30"> + expires_after="2026-05-25"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -1636,7 +1641,7 @@ </histogram> <histogram name="Arc.Net.DnsQuery.Other" enum="BooleanSuccess" - expires_after="2025-11-30"> + expires_after="2026-05-25"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -1694,7 +1699,7 @@ </histogram> <histogram name="Arc.OptInAction" enum="ArcOptInAction" - expires_after="2025-07-13"> + expires_after="2026-04-19"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -1704,7 +1709,7 @@ </histogram> <histogram name="Arc.OptInCancel" enum="ArcOptInCancel" - expires_after="2025-10-07"> + expires_after="2026-04-19"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary>Arc OptIn cancelation reason.</summary> @@ -1752,7 +1757,7 @@ </histogram> <histogram name="Arc.OptinTosLoadResult" enum="BooleanSuccess" - expires_after="2025-12-07"> + expires_after="2026-06-01"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -1902,7 +1907,7 @@ </histogram> <histogram name="Arc.Policy.Keys" enum="ArcPolicyKey" - expires_after="2025-11-30"> + expires_after="2026-05-25"> <owner>jhorwich@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -1980,7 +1985,7 @@ </histogram> <histogram name="Arc.Provisioning.DeviceAffiliationAction" - enum="UnaffiliatedDeviceArcAllowedStatus" expires_after="2025-07-13"> + enum="UnaffiliatedDeviceArcAllowedStatus" expires_after="2026-07-13"> <owner>preranap@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -2044,7 +2049,7 @@ </histogram> <histogram name="Arc.Provisioning.TimeDelta.Failure{ArcUserTypes}" units="ms" - expires_after="2025-10-12"> + expires_after="2026-08-12"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -2058,7 +2063,7 @@ </histogram> <histogram name="Arc.Provisioning.TimeDelta.Success{ArcUserTypes}" units="ms" - expires_after="2025-10-26"> + expires_after="2026-06-22"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -2345,7 +2350,7 @@ </histogram> <histogram name="Arc.Supervision.Transition.Result" - enum="ArcSupervisionTransitionResult" expires_after="2025-11-16"> + enum="ArcSupervisionTransitionResult" expires_after="2026-07-13"> <owner>jhorwich@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -2355,7 +2360,7 @@ </histogram> <histogram name="Arc.Supervision.Transition.Screen.Success.TimeDelta" - units="ms" expires_after="2025-10-26"> + units="ms" expires_after="2026-06-22"> <owner>jhorwich@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -2365,7 +2370,7 @@ </histogram> <histogram name="Arc.Supervision.Transition.Screen.Successful" - enum="BooleanSuccess" expires_after="2025-11-30"> + enum="BooleanSuccess" expires_after="2026-05-18"> <owner>jhorwich@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> @@ -2374,7 +2379,7 @@ </histogram> <histogram name="Arc.SystemHealth.Upgrade.PackagesDeleted" - enum="BooleanDeletedOrNot" expires_after="2025-08-29"> + enum="BooleanDeletedOrNot" expires_after="2026-06-30"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -2383,7 +2388,7 @@ </histogram> <histogram name="Arc.SystemHealth.Upgrade.TimeDelta" units="ms" - expires_after="2025-08-29"> + expires_after="2026-06-30"> <owner>jhorwich@google.com</owner> <owner>arc-core@google.com</owner> <summary> @@ -2834,12 +2839,13 @@ </histogram> <histogram name="Arc.VpnServiceBuilderCompatApisCounter" - enum="VpnServiceBuilderCompatApisList" expires_after="2024-09-11"> + enum="VpnServiceBuilderCompatApisList" expires_after="2026-07-11"> <owner>preranap@google.com</owner> <owner>arc-commercial@google.com</owner> <summary> Records the number of times an API for adding and excluding route in VPN is - called from ChromeOS Vpn Service Builder Compat Library. + called from ChromeOS Vpn Service Builder Compat Library. Warning: This + histogram was expired from 2024-09-11 to 2025-07-01; data may be missing. </summary> </histogram>
diff --git a/tools/metrics/histograms/metadata/chromeos_settings/histograms.xml b/tools/metrics/histograms/metadata/chromeos_settings/histograms.xml index c7c79bd..ad86778 100644 --- a/tools/metrics/histograms/metadata/chromeos_settings/histograms.xml +++ b/tools/metrics/histograms/metadata/chromeos_settings/histograms.xml
@@ -859,7 +859,7 @@ </histogram> <histogram name="ChromeOS.Settings.SearchRequests" - enum="OsSettingSearchRequestTypes" expires_after="2025-08-10"> + enum="OsSettingSearchRequestTypes" expires_after="2026-06-30"> <owner>wesokuhara@google.com</owner> <owner>xiaohuic@chromium.org</owner> <owner>cros-settings@google.com</owner> @@ -873,7 +873,7 @@ </histogram> <histogram name="ChromeOS.Settings.SearchRequestsPerSession" - units="mojo search requests" expires_after="2026-02-14"> + units="mojo search requests" expires_after="2026-06-30"> <owner>wesokuhara@google.com</owner> <owner>xiaohuic@chromium.org</owner> <owner>cros-settings@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/platform/histograms.xml b/tools/metrics/histograms/metadata/platform/histograms.xml index 0cc44a78..3055a84 100644 --- a/tools/metrics/histograms/metadata/platform/histograms.xml +++ b/tools/metrics/histograms/metadata/platform/histograms.xml
@@ -741,7 +741,7 @@ </histogram> <histogram name="Platform.DiskUsageChronos" units="KB" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -751,7 +751,7 @@ </summary> </histogram> -<histogram name="Platform.DiskUsageVar" units="KB" expires_after="2025-11-16"> +<histogram name="Platform.DiskUsageVar" units="KB" expires_after="2026-11-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -891,7 +891,7 @@ </histogram> <histogram name="Platform.FileSystem.{Partition}.fsckResult" enum="FsckResult" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -901,7 +901,7 @@ </histogram> <histogram name="Platform.FileSystem.{Partition}_ErrorCount" units="errors" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -912,7 +912,7 @@ </histogram> <histogram name="Platform.FileSystem.{Partition}_{MountResult}" enum="Boolean" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2074,7 +2074,7 @@ </histogram> <histogram name="Platform.ReadSectorsLong" units="sectors per second" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2084,7 +2084,7 @@ </histogram> <histogram name="Platform.ReadSectorsShort" units="sectors per second" - expires_after="2025-11-23"> + expires_after="2026-11-23"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2191,7 +2191,7 @@ </histogram> <histogram name="Platform.SATA.AvailableReservedSpace" units="%" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2202,7 +2202,7 @@ </histogram> <histogram name="Platform.SATA.LogicalSectorsRead" units="512-byte sectors" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2213,7 +2213,7 @@ </histogram> <histogram name="Platform.SATA.LogicalSectorsWritten" units="512-byte sectors" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2224,7 +2224,7 @@ </histogram> <histogram name="Platform.SATA.PercentageUsed" units="%" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2262,21 +2262,21 @@ </histogram> <histogram name="Platform.SmartTransferErrors" units="units" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary>Disk communication errors (SMART 199), sent at boot.</summary> </histogram> <histogram name="Platform.SmartUncorrectableErrors" units="units" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary>Uncorrectable disk errors (SMART 187), sent at boot.</summary> </histogram> <histogram name="Platform.StatefulFormat" enum="StatefulFormat" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>sarthakkukreti@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2284,7 +2284,7 @@ </histogram> <histogram name="Platform.StatefulFreeSpace" units="MB" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2294,7 +2294,7 @@ </histogram> <histogram name="Platform.StatefulLifetimeWrites" units="GiB" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2304,7 +2304,7 @@ </histogram> <histogram name="Platform.StatefulTrim.TimeBetweenTrim" units="hours" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2320,7 +2320,7 @@ </histogram> <histogram name="Platform.StatefulTrim.TrimmedAmount" units="MiB" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2335,7 +2335,7 @@ </summary> </histogram> -<histogram name="Platform.StatefulUsage" units="%" expires_after="2025-07-16"> +<histogram name="Platform.StatefulUsage" units="%" expires_after="2026-07-16"> <owner>dlunev@chromium.org</owner> <owner>omrilio@chromium.org</owner> <summary> @@ -2345,7 +2345,7 @@ </histogram> <histogram name="Platform.StatefulUsedSpace" units="GB" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2355,7 +2355,7 @@ </histogram> <histogram name="Platform.StatefulWritesDaily" units="KiB" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2396,7 +2396,7 @@ </histogram> <histogram name="Platform.Storage.Ufs.LifeUsed.{Type}" enum="EmmcLifeUsed" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>asavery@chromium.org</owner> <owner>gwendal@chromium.org</owner> <owner>chromeos-storage@google.com</owner> @@ -2412,7 +2412,7 @@ </histogram> <histogram name="Platform.StorageCapabilities" - enum="InternalStorageCapabilities" expires_after="2025-11-16"> + enum="InternalStorageCapabilities" expires_after="2026-11-16"> <owner>dlunev@chromium.org</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2421,7 +2421,7 @@ </summary> </histogram> -<histogram name="Platform.SwapInDaily" units="pages" expires_after="2025-11-16"> +<histogram name="Platform.SwapInDaily" units="pages" expires_after="2026-11-16"> <owner>asavery@chromium.org</owner> <owner>chromeos-memory@google.com</owner> <owner>chromeos-storage@google.com</owner> @@ -2429,7 +2429,7 @@ </histogram> <histogram name="Platform.SwapOutDaily" units="pages" - expires_after="2025-11-16"> + expires_after="2026-11-16"> <owner>asavery@chromium.org</owner> <owner>chromeos-memory@google.com</owner> <owner>chromeos-storage@google.com</owner> @@ -2440,7 +2440,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.LvmMetadataTime" units="ms" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2449,7 +2449,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.ResizeTime" units="ms" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2458,7 +2458,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.Result" - enum="ThinpoolMigrationResult" expires_after="2025-07-16"> + enum="ThinpoolMigrationResult" expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2468,7 +2468,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.RevertTime" units="ms" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2478,7 +2478,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.ThinpoolMetadataTime" units="ms" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2488,7 +2488,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.TotalTime" units="ms" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2497,7 +2497,7 @@ </histogram> <histogram name="Platform.ThinpoolMigration.TriesLeftAtCompletion" - units="units" expires_after="2025-07-16"> + units="units" expires_after="2026-07-16"> <owner>sarthakkukreti@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary> @@ -2982,7 +2982,7 @@ </histogram> <histogram name="Platform.WriteSectorsLong" units="sectors per second" - expires_after="2025-07-16"> + expires_after="2026-07-16"> <owner>gwendal@google.com</owner> <owner>chromeos-storage@google.com</owner> <summary>
diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py index b2b8bd9..d0f9ca7f 100755 --- a/tools/perf/core/perf_data_generator.py +++ b/tools/perf/core/perf_data_generator.py
@@ -554,7 +554,7 @@ }], 'dimension': { 'cpu': 'x86-64', - 'os': 'Windows-10', + 'os': 'Windows 10 version 22H2 (Windows-10-19045)', 'pool': 'chrome.tests', }, 'perf_trigger':
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json index 5fc43d1..52efad26 100644 --- a/tools/perf/core/perfetto_binary_roller/binary_deps.json +++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -6,7 +6,7 @@ }, "win": { "hash": "6fa058359dcbca93f5d6ab13a433f2c9f7f0411a", - "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/c3b73394a57ca7df3d2fee5645cffa24ebf13aa3/trace_processor_shell.exe" + "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/b1756f96840a5f6f9e1f3c073e901b9462fea79f/trace_processor_shell.exe" }, "linux_arm": { "hash": "1fb099c947784ed2aa6e936668afa9d3ce4531b3",
diff --git a/tools/privacy_budget/font_indexer/font_indexer.cc b/tools/privacy_budget/font_indexer/font_indexer.cc index 33cb719..d7a331c 100644 --- a/tools/privacy_budget/font_indexer/font_indexer.cc +++ b/tools/privacy_budget/font_indexer/font_indexer.cc
@@ -105,7 +105,7 @@ const base::Value::List& font = i.GetList(); std::string non_localized_name = font[0].GetString(); - PrintAllFontsWithName(WTF::AtomicString(non_localized_name.c_str())); + PrintAllFontsWithName(blink::AtomicString(non_localized_name.c_str())); } has_font_list_loaded_ = true; @@ -113,7 +113,7 @@ std::move(quit_closure_).Run(); } -bool FontIndexer::DoesFontHaveDigest(WTF::AtomicString name, +bool FontIndexer::DoesFontHaveDigest(blink::AtomicString name, blink::FontDescription font_description, int64_t digest) { const blink::SimpleFontData* font_data = @@ -125,7 +125,7 @@ } bool FontIndexer::DoFontsWithNameHaveVaryingWeights( - WTF::AtomicString name, + blink::AtomicString name, int64_t default_font_digest) { blink::FontDescription font_description; @@ -138,7 +138,7 @@ } bool FontIndexer::DoFontsWithNameHaveVaryingWidths( - WTF::AtomicString name, + blink::AtomicString name, int64_t default_font_digest) { blink::FontDescription font_description; @@ -151,7 +151,7 @@ } bool FontIndexer::DoFontsWithNameHaveVaryingSlopes( - WTF::AtomicString name, + blink::AtomicString name, int64_t default_font_digest) { blink::FontDescription font_description; @@ -163,7 +163,7 @@ return (!DoesFontHaveDigest(name, font_description, default_font_digest)); } -void FontIndexer::PrintAllFontsWithName(WTF::AtomicString name) { +void FontIndexer::PrintAllFontsWithName(blink::AtomicString name) { WTF::HashSet<int64_t> set_of_digests; // First, we load the font with default selection settings to verify any font
diff --git a/tools/privacy_budget/font_indexer/font_indexer.h b/tools/privacy_budget/font_indexer/font_indexer.h index e3d84d6..a123dae 100644 --- a/tools/privacy_budget/font_indexer/font_indexer.h +++ b/tools/privacy_budget/font_indexer/font_indexer.h
@@ -63,22 +63,22 @@ // Determines whether the fonts with |name| appear to vary along the specified // axis, by comparing font digests at extreme values to |default_font_digest|. - bool DoFontsWithNameHaveVaryingWeights(WTF::AtomicString name, + bool DoFontsWithNameHaveVaryingWeights(blink::AtomicString name, int64_t default_font_digest); - bool DoFontsWithNameHaveVaryingWidths(WTF::AtomicString name, + bool DoFontsWithNameHaveVaryingWidths(blink::AtomicString name, int64_t default_font_digest); - bool DoFontsWithNameHaveVaryingSlopes(WTF::AtomicString name, + bool DoFontsWithNameHaveVaryingSlopes(blink::AtomicString name, int64_t default_font_digest); // Determines whether a font lookup for |name| with |font_description| results // in a typeface with |digest|. - bool DoesFontHaveDigest(WTF::AtomicString name, + bool DoesFontHaveDigest(blink::AtomicString name, blink::FontDescription font_description, int64_t digest); // Enumerates fonts with |name| and prints tab-separated lines with each // font's details. - void PrintAllFontsWithName(WTF::AtomicString name); + void PrintAllFontsWithName(blink::AtomicString name); blink::FontCache* font_cache_; bool has_font_list_loaded_ = false;
diff --git a/tools/win/DebugVisualizers/blink.natvis b/tools/win/DebugVisualizers/blink.natvis index 199ce33..086e0015 100644 --- a/tools/win/DebugVisualizers/blink.natvis +++ b/tools/win/DebugVisualizers/blink.natvis
@@ -82,7 +82,7 @@ <Item Name="HashRaw">*(int*)&hash_and_flags_ >> 8</Item> </Expand> </Type> - <Type Name="WTF::AtomicString"> + <Type Name="blink::AtomicString"> <DisplayString IncludeView="bare">{string_,view(bare)}</DisplayString> <DisplayString>{string_}</DisplayString> </Type>
diff --git a/ui/gfx/mac/color_space_util.mm b/ui/gfx/mac/color_space_util.mm index 4673df0..0db993d 100644 --- a/ui/gfx/mac/color_space_util.mm +++ b/ui/gfx/mac/color_space_util.mm
@@ -33,9 +33,9 @@ for (const auto& p : cfstr_id_pairs) { if (p.cfstr_cm) { - DCHECK(!CFStringCompare(p.cfstr_cv, p.cfstr_cm, 0)); + DCHECK_EQ(CFStringCompare(p.cfstr_cv, p.cfstr_cm, 0), kCFCompareEqualTo); } - if (!CFStringCompare(value_as_string, p.cfstr_cv, 0)) { + if (CFStringCompare(value_as_string, p.cfstr_cv, 0) == kCFCompareEqualTo) { *value_as_id = p.id; return true; } @@ -248,15 +248,22 @@ if (value_as_string) { // For matrices that macOS doesn't recognize it'll return a value of the // form "YCbCrMatrix#n" where n seems to correspond to the ISO - // 23001-8:2016 id; see VideoColorSpace::MatrixID. We could add - // generalized code to handle this, but it's rarely seen so favor - // simplicity. + // 23001-8:2016 id; see VideoColorSpace::MatrixID. Here we only add + // `BT470BG` because it is technically the same matrix as `SMPTE170M`, and + // both can be mapped to `kCVImageBufferYCbCrMatrix_ITU_R_601_4`. This + // mapping ensures that `IOSurfaceSetColorSpace()` correctly configures + // the underlying color space. + // + // We should not add generalized code to handle this in the future, since + // `media/gpu/mac/video_toolbox_frame_converter.cc` will use the result + // from this function to determine if the overlay should be promoted or + // not. For color spaces that macOS doesn't support, overlays should + // always be disabled to ensure correct color space transform. // // Note: We don't include this value in GetSupportedImageMatrix() since // we only want to translate this value when it comes from macOS. - // Note 2: The space after the number is intentional. Presumably it's to - // leave room for two digit matrix IDs. - if (CFStringCompare(value_as_string, CFSTR("YCbCrMatrix#5 "), 0)) { + if (CFStringCompare(value_as_string, CFSTR("YCbCrMatrix#5"), 0) == + kCFCompareEqualTo) { return gfx::ColorSpace::MatrixID::BT470BG; }